From c4810274ec467e0cdef7380582703898e9eaaedb Mon Sep 17 00:00:00 2001 From: chris2tof Date: Wed, 16 Nov 2011 09:47:09 +0800 Subject: [PATCH] Rescue nil values for attribute_values in User --- app/helpers/panel/user_helper.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/helpers/panel/user_helper.rb b/app/helpers/panel/user_helper.rb index a0fd1366..b536f959 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