Ray's modifications

app/models/user/attribute_model.rb

@@ -29,7 +29,8 @@ class AttributeModel
     if self.i18n_variable_id
       self.i18n_variable.update_attributes(attr)
     else
-      var = I18nVariable.new(attr.merge({:key => self.key, :document_class => self.class, :parent_id => self.user_attribute_model.i18n_variable_id}))
+      # var = I18nVariable.new(attr.merge({:key => self.key, :document_class => self.class, :parent_id => self.user_attribute_model.i18n_variable_id}))
+      var = I18nVariable.new(attr.merge({:key => self.key, :document_class => self.class}))
       var.save
       self.i18n_variable_id = var.id
     end

app/models/user/user.rb

@@ -8,12 +8,11 @@ class User
   mount_uploader :avatar, AvatarUploader
   
   field :admin, :type => Boolean, :default => true
-  field :active_roles, :type => Array
+  field :active_role
   
   has_many :user_attributes
   has_many :user_roles
   has_many :user_infos
-  before_save :clean_active_roles
   
   # Update or create the user_role records
   def user_roles=(*attrs)
@@ -49,21 +48,6 @@ class User
     self.user_roles.detect {|a| a.key.to_s == key.to_s }
   end
   
-  # Get the active user_role_models
-  def get_active_role_models
-    self.active_roles.map{ |role| get_role_model(role) } rescue []
-  end
-  
-  # Get an user_role_model from key
-  def get_role_model(key)
-    UserRoleModel.first(:conditions => {:key => key})
-  end
-  
-  # Get the active roles names or default to '-'
-  def get_roles
-    (self.active_roles.nil? || self.active_roles.empty?) ? '-' : self.active_roles.map{|role| I18nVariable.first(:conditions => {:key => role})[I18n.locale] rescue role}.join(' / ')
-  end
-  
   def name
     infos = self.user_infos.detect {|info| info.key.to_s.eql?('profile') }
     if infos
@@ -75,11 +59,4 @@ class User
     end
   end
   
-  protected
-  
-  # Remove empty values
-  def clean_active_roles
-    self.active_roles.delete('') if self.active_roles
-  end
-  
 end

app/models/user/user_role_model.rb

@@ -1,3 +1,8 @@
 class UserRoleModel < UserAttributeModel
   
+  # Get an user_role_model from key
+  def self.get_role_model_from_key(key)
+    self.first(:conditions => {:key => key})
+  end
+  
 end