changes for login …
This commit is contained in:
1 parent
2ebba577eb
commit
a23f290831
2 files changed
+2
-2
No files matched your search
@@ -6,7 +6,7 @@ class OtherAccount
|
||||
field :email
|
||||
field :encrypted_password
|
||||
|
||||
attr_encrypted :encrypted_password, :key => 'rulingorbit.com', :encode => true
|
||||
#attr_encrypted :encrypted_password, :key => 'rulingorbit.com', :encode => true
|
||||
|
||||
belongs_to :user
|
||||
|
||||
@@ -17,7 +17,7 @@ class User
|
||||
|
||||
has_many :managing_apps,:class_name => "AppManager"
|
||||
has_one :desktop, :autosave => true, :dependent => :destroy
|
||||
has_many :otheraccount, :autosave => true, :dependent => :destroy
|
||||
has_many :other_accounts, :autosave => true, :dependent => :destroy
|
||||
belongs_to :role
|
||||
has_and_belongs_to_many :sub_roles
|
||||
accepts_nested_attributes_for :attribute_values, :allow_destroy => true
|
||||
|
||||
Reference in new issue
Block a user