| @@ -136,6 +136,7 class User < Principal | |||||
| 136 | @membership_by_project_id = nil |
|
136 | @membership_by_project_id = nil | |
| 137 | @notified_projects_ids = nil |
|
137 | @notified_projects_ids = nil | |
| 138 | @notified_projects_ids_changed = false |
|
138 | @notified_projects_ids_changed = false | |
|
|
139 | @builtin_role = nil | |||
| 139 | base_reload(*args) |
|
140 | base_reload(*args) | |
| 140 | end |
|
141 | end | |
| 141 |
|
142 | |||
| @@ -444,11 +445,7 class User < Principal | |||||
| 444 |
|
445 | |||
| 445 | # Returns the user's bult-in role |
|
446 | # Returns the user's bult-in role | |
| 446 | def builtin_role |
|
447 | def builtin_role | |
| 447 | if logged? |
|
448 | @builtin_role ||= (logged? ? Role.non_member : Role.anonymous) | |
| 448 | @role_non_member ||= Role.non_member |
|
|||
| 449 | else |
|
|||
| 450 | @role_anonymous ||= Role.anonymous |
|
|||
| 451 | end |
|
|||
| 452 | end |
|
449 | end | |
| 453 |
|
450 | |||
| 454 | # Return user's roles for project |
|
451 | # Return user's roles for project | |
| @@ -49,6 +49,7 class SearchTest < ActiveSupport::TestCase | |||||
| 49 |
|
49 | |||
| 50 | # Removes the :view_changesets permission from Anonymous role |
|
50 | # Removes the :view_changesets permission from Anonymous role | |
| 51 | remove_permission Role.anonymous, :view_changesets |
|
51 | remove_permission Role.anonymous, :view_changesets | |
|
|
52 | User.current = nil | |||
| 52 |
|
53 | |||
| 53 | r = Issue.search(@issue_keyword).first |
|
54 | r = Issue.search(@issue_keyword).first | |
| 54 | assert r.include?(@issue) |
|
55 | assert r.include?(@issue) | |
| @@ -74,6 +75,7 class SearchTest < ActiveSupport::TestCase | |||||
| 74 |
|
75 | |||
| 75 | # Removes the :view_changesets permission from Non member role |
|
76 | # Removes the :view_changesets permission from Non member role | |
| 76 | remove_permission Role.non_member, :view_changesets |
|
77 | remove_permission Role.non_member, :view_changesets | |
|
|
78 | User.current = User.find_by_login('rhill') | |||
| 77 |
|
79 | |||
| 78 | r = Issue.search(@issue_keyword).first |
|
80 | r = Issue.search(@issue_keyword).first | |
| 79 | assert r.include?(@issue) |
|
81 | assert r.include?(@issue) | |
General Comments 0
You need to be logged in to leave comments.
Login now