diff --git a/app/helpers/panel/user_helper.rb b/app/helpers/panel/user_helper.rb index a0fd13663..b536f9593 100644 --- a/app/helpers/panel/user_helper.rb +++ b/app/helpers/panel/user_helper.rb @@ -1,11 +1,15 @@ module Panel::UserHelper def show_user_attribute(object, key, locale = '') - attribute = object.attribute_values.detect {|av| av.key.to_s.eql?(key.to_s) || av[locale.to_s].eql?(locale.to_s) } - if locale.to_s.blank? - attribute['key'] + attribute = object.attribute_values.detect {|av| av.key.to_s.eql?(key.to_s) || av[locale.to_s].eql?(locale.to_s) } rescue nil + if attribute + if locale.to_s.blank? + attribute['key'] + else + attribute[locale.to_s] + end else - attribute[locale.to_s] + '' end end