Changes for sub_roles

Issues: update doesn't create new i18n_variables, role form has bugs
This commit is contained in:
chris2tof committed 2011-12-18 10:07:42 +08:00
1 parent d23cf152da
commit d27d7a623c
62 files changed
+508 -1142

No files matched your search

+8 -4
View File
@@ -16,14 +16,18 @@ class User
accepts_nested_attributes_for :attribute_values, :allow_destroy => true
def name
infos = self.user_infos.detect {|info| info.key.to_s.eql?('profile') }
if infos
first_name = infos.attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
last_name = infos.attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
info = Class::Info.first(:conditions => {:key => 'profile'})
if info
first_name = get_attribute_values.detect {|value| value.key.to_s.eql?('first_name') }[I18n.locale.to_s] rescue nil
last_name = get_attribute_values.detect {|value| value.key.to_s.eql?('last_name') }[I18n.locale.to_s] rescue nil
return "#{first_name} #{last_name}"
else
return nil
end
end
def get_attribute_values
@attribute_values ||= self.attribute_values.to_a
end
end