Ray's modifications
This commit is contained in:
1 parent
861237d65b
commit
65349796d0
105 files changed
+1663
-369
No files matched your search
+1
-24
@@ -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
|
||||
Reference in new issue
Block a user