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

This commit is contained in:
Matt Farnsworth 2015-12-04 15:41:54 +02:00
commit 02e08a5b15
4 changed files with 19 additions and 21 deletions

View file

@ -67,7 +67,7 @@ class ApplicationController < ActionController::Base
end
def user_log_str(user)
user.nil? ? 'public' : user.string
user.nil? ? 'public' : user.id_role_username
end
def comma_support_for(parent_key, key)