diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/guest.rb | 2 | ||||
| -rw-r--r-- | app/models/role.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/app/models/guest.rb b/app/models/guest.rb index 4348c85..2c01803 100644 --- a/app/models/guest.rb +++ b/app/models/guest.rb @@ -10,7 +10,7 @@ class Guest < Hobo::Guest def nick; nil; end def project_lead; false; end def questions_to_approve; []; end - def role; Role.new(:guest); end + def role; RichTypes::Role.new(:guest); end def token; nil; end def valid?; true; end def save!; true; end diff --git a/app/models/role.rb b/app/models/role.rb deleted file mode 100644 index 4e122d9..0000000 --- a/app/models/role.rb +++ /dev/null @@ -1 +0,0 @@ -Role = HoboFields::EnumString.for(:recruit, :mentor, :recruiter) diff --git a/app/models/user.rb b/app/models/user.rb index 078c37c..828840f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,7 +12,7 @@ class User < ActiveRecord::Base name :string, :required, :unique email_address :email_address, :login => true administrator :boolean, :default => false - role Role, :default => 'recruit' + role RichTypes::Role, :default => 'recruit' nick :string openid :string contributions HoboFields::MarkdownString @@ -215,8 +215,8 @@ class User < ActiveRecord::Base # and make sure change to role wasn't changed or was promotion of recruit # to mentor or demotion of mentor to recruit return true unless role_changed? - return true if role.is_mentor? && Role.new(role_was).is_recruit? - return true if role.is_recruit? && Role.new(role_was).is_mentor? + return true if role.is_mentor? && RichTypes::Role.new(role_was).is_recruit? + return true if role.is_recruit? && RichTypes::Role.new(role_was).is_mentor? false end |