Story 109367694 - refactor method name also

This commit is contained in:
Matt Farnsworth 2015-12-04 15:40:33 +02:00
parent 5b47f21dbe
commit 1f0e8f86e9

View file

@ -22,17 +22,17 @@ module Versions
def creator def creator
return nil if creator_str.blank? return nil if creator_str.blank?
creator = user_from_id_class_name creator_str creator = user_from_id_role_username creator_str
creator.present? ? creator : creator_str creator.present? ? creator : creator_str
end end
def updator def updator
return nil if updator_str.blank? return nil if updator_str.blank?
updator = user_from_id_class_name updator_str updator = user_from_id_role_username updator_str
updator.present? ? updator : updator_str updator.present? ? updator : updator_str
end end
def user_from_id_class_name(str) def user_from_id_role_username(str)
user = ApiUser.find_by(id: $1) if str =~ /^(\d+)-(ApiUser:|api-)/ user = ApiUser.find_by(id: $1) if str =~ /^(\d+)-(ApiUser:|api-)/
unless user.present? unless user.present?
user = AdminUser.find_by(id: $1) if str =~ /^(\d+)-AdminUser:/ user = AdminUser.find_by(id: $1) if str =~ /^(\d+)-AdminUser:/