Merge branch '109367694-epp-id-conventions' into staging

This commit is contained in:
Matt Farnsworth 2015-12-03 18:52:27 +02:00
commit fd54c382c3
5 changed files with 18 additions and 16 deletions

View file

@ -67,8 +67,7 @@ class ApplicationController < ActionController::Base
end
def user_log_str(user)
return 'public' if user.nil?
"#{user.id}-#{user.class}: #{user.username}"
user.nil? ? 'public' : user.string
end
def comma_support_for(parent_key, key)