Skip to content

Commit 35baed2

Browse files
author
Nicholas Watson
committed
updated
1 parent c996677 commit 35baed2

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

app/models/user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class User < ActiveRecord::Base
1515

1616
has_one :avatar, :class_name => "Photo", :as => :photoable
1717

18-
has_one :profile, :dependent => :destroy
18+
has_one :profile, :dependent => :destroy, :class_name => "EntropiSocial::Profile"
1919
has_many :memberships, :dependent => :destroy
2020
has_many :groups, :as => :groupable
2121

db/migrate/20111118193950_setup_entropi_social.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ class SetupEntropiSocial < ActiveRecord::Migration
22
def up
33
create_table :users do |t|
44
t.integer :invitation_limit, :default => 0
5+
t.boolean :admin, :default => false, :null => false
6+
t.boolean :banned, :default => false, :null => false
57
t.database_authenticatable :null => false
68
t.invitable
79
t.recoverable
810
t.rememberable
911
t.trackable
1012
t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
11-
t.boolean :admin, :default => false
1213
t.timestamps
1314
end
1415

0 commit comments

Comments
 (0)