Merge lp:~yeliabmas/sloecode/bug-fix into lp:sloecode

Proposed by Sam Bailey
Status: Needs review
Proposed branch: lp:~yeliabmas/sloecode/bug-fix
Merge into: lp:sloecode
Diff against target: 28 lines (+6/-5)
1 file modified
sloecode/controllers/admin/person.py (+6/-5)
To merge this branch: bzr merge lp:~yeliabmas/sloecode/bug-fix
Reviewer Review Type Date Requested Status
Thomi Richards Pending
Review via email: mp+120314@code.launchpad.net

Commit message

Fix for bug #1017262. User can no longer modify their user_roles unless they are a user admin.

Description of the change

Fix for bug #1017262.
User can no longer modify their user_roles unless they are a user admin

To post a comment you must log in.

Unmerged revisions

158. By Sam Bailey

Fix for bug #1017262, user can no longer modify their own project roles unless they are a user admin.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sloecode/controllers/admin/person.py'
2--- sloecode/controllers/admin/person.py 2012-05-01 04:14:51 +0000
3+++ sloecode/controllers/admin/person.py 2012-08-20 02:14:23 +0000
4@@ -22,6 +22,7 @@
5 from pylons import config, request
6 from pylons.controllers.util import redirect
7 from repoze.what.plugins.pylonshq import ActionProtector
8+from repoze.what.plugins.pylonshq import is_met
9 from repoze.what.predicates import Any
10
11 from webhelpers.paginate import Page
12@@ -149,11 +150,11 @@
13
14 person.name = form_result['name']
15 person.email = form_result['email']
16-
17- # update roles:
18- new_roles = [SiteRole(role=r) for r in form_result['site_roles']]
19- person.site_roles = new_roles
20-
21+
22+ if is_met(has_site_role(role=USER_ADMIN)):
23+ # update roles:
24+ new_roles = [SiteRole(role=r) for r in form_result['site_roles']]
25+ person.site_roles = new_roles
26
27 Session.merge(person)
28 Session.commit()

Subscribers

People subscribed via source and target branches