developers
/
orbit-basic
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes for login …

This commit is contained in:
Harry Bomrah 2012-04-27 22:14:44 +08:00
parent 2ebba577eb
commit a23f290831
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/other_accounts.rb → app/models/other_account.rb
View File

@ -6,7 +6,7 @@ class OtherAccount
field :email field :email
field :encrypted_password field :encrypted_password
attr_encrypted :encrypted_password, :key => 'rulingorbit.com', :encode => true #attr_encrypted :encrypted_password, :key => 'rulingorbit.com', :encode => true
belongs_to :user belongs_to :user

2
app/models/user/user.rb
View File

@ -17,7 +17,7 @@ class User
has_many :managing_apps,:class_name => "AppManager" has_many :managing_apps,:class_name => "AppManager"
has_one :desktop, :autosave => true, :dependent => :destroy 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 belongs_to :role
has_and_belongs_to_many :sub_roles has_and_belongs_to_many :sub_roles
accepts_nested_attributes_for :attribute_values, :allow_destroy => true accepts_nested_attributes_for :attribute_values, :allow_destroy => true