From a23f290831df046fb02a37ca9e5d3b98fa4ed074 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 27 Apr 2012 22:14:44 +0800 Subject: [PATCH] =?UTF-8?q?changes=20for=20login=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/{other_accounts.rb => other_account.rb} | 2 +- app/models/user/user.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename app/models/{other_accounts.rb => other_account.rb} (66%) diff --git a/app/models/other_accounts.rb b/app/models/other_account.rb similarity index 66% rename from app/models/other_accounts.rb rename to app/models/other_account.rb index b702974f..59f5a1de 100644 --- a/app/models/other_accounts.rb +++ b/app/models/other_account.rb @@ -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 diff --git a/app/models/user/user.rb b/app/models/user/user.rb index 84f556c2..2b405e16 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -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