diff options
| -rw-r--r-- | app/models/user.rb | 6 | ||||
| -rw-r--r-- | features/openid.feature | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 7ff0640..cb6afbe 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -105,7 +105,11 @@ class User < ActiveRecord::Base end def mentor_edit_permitted? - mentor.nil? || mentor_is?(acting_user) + return true if mentor_is?(acting_user) + return true if mentor.nil? && acting_user.role.is_mentor? + return true if mentor.nil? && acting_user.role.is_recruiter? + return true if acting_user.administrator? + false end def destroy_permitted? diff --git a/features/openid.feature b/features/openid.feature index 8d09795..71de6d5 100644 --- a/features/openid.feature +++ b/features/openid.feature @@ -32,5 +32,5 @@ Feature: OpenID And I press "Log in" When I am on the homepage - Then I should be on edit "" user page - And I should see "Please set data for your account" + Then I should see "Please set data for your account" + And I should not see "Mentor" |