Changes for sub_roles

Issues: update doesn't create new i18n_variables, role form has bugs

app/models/user/attribute.rb

@@ -7,7 +7,7 @@ class Attribute
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
   
-  embeds_many :attribute_fields
+  has_many :attribute_fields, :autosave => true, :dependent => :destroy
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   accepts_nested_attributes_for :i18n_variable, :allow_destroy => true
   accepts_nested_attributes_for :attribute_fields, :allow_destroy => true

app/models/user/attribute_field.rb

@@ -5,12 +5,12 @@ class AttributeField
   
   field :key
   field :markup
-  field :locale, :type => Boolean
+  field :locale, :type => Boolean, :default => true
   field :list_options, :type => Array
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
   
-  embedded_in :attribute
+  belongs_to :attribute
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :attribute_values
   validates_uniqueness_of :key

app/models/user/role.rb

@@ -7,7 +7,7 @@ class Role
   field :built_in, :type => Boolean, :default => false
   field :disabled, :type => Boolean, :default => false
   
-  embeds_many :sub_roles
+  has_many :sub_roles, :autosave => true, :dependent => :destroy
   has_one :i18n_variable, :as => :language_value, :autosave => true, :dependent => :destroy
   has_many :users
   accepts_nested_attributes_for :i18n_variable, :allow_destroy => true

app/models/user/sub_role.rb

@@ -1,5 +1,6 @@
 class SubRole < Attribute
-
+  
+  belongs_to :role
   has_many :users
   
   # Get an sub_role from key

app/models/user/user.rb

@@ -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