Mercurial Mercurial > py_tasks_melange / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Students can not become a mentor or org_admin in the same program.
authorLennard de Rijk <ljvderijk@gmail.com>
Tue, 17 Feb 2009 19:35:00 +0000
changeset 1377 101759701e51
parent 1376 ee386b5b56d7
child 1378 8c7f5411d372
Students can not become a mentor or org_admin in the same program. Patch by: Lennard de Rijk Reviewed by: to-be-reviewed
app/soc/views/models/mentor.py file | annotate | diff | comparison | revisions
app/soc/views/models/org_admin.py file | annotate | diff | comparison | revisions 
--- a/app/soc/views/models/mentor.py	Tue Feb 17 19:33:54 2009 +0000
+++ b/app/soc/views/models/mentor.py	Tue Feb 17 19:35:00 2009 +0000
@@ -56,7 +56,8 @@
     rights['delete'] = ['checkIsDeveloper']
     # TODO accessCheck checkIsAdministratorForOrg
     rights['invite'] = ['checkIsDeveloper']
-    rights['accept_invite'] = [('checkCanCreateFromRequest', 'mentor')]
+    rights['accept_invite'] = [('checkCanCreateFromRequest', 'mentor'),
+        'checkIsNotStudentForProgramOfOrg']
     # TODO accessCheck checkIsAdministratorForOrg
     rights['process_request'] = ['checkIsDeveloper',
         ('checkCanProcessRequest', 'mentor')]
--- a/app/soc/views/models/org_admin.py	Tue Feb 17 19:33:54 2009 +0000
+++ b/app/soc/views/models/org_admin.py	Tue Feb 17 19:35:00 2009 +0000
@@ -61,7 +61,8 @@
     rights['delete'] = ['checkIsDeveloper']
     # TODO accessCheck checkIsAdministratorForOrg
     rights['invite'] = ['checkIsDeveloper']
-    rights['accept_invite'] = [('checkCanCreateFromRequest', 'org_admin')]
+    rights['accept_invite'] = [('checkCanCreateFromRequest', 'org_admin'),
+        'checkIsNotStudentForProgramOfOrg']
     # TODO accessCheck checkIsAdministratorForOrg
     rights['process_request'] = ['checkIsDeveloper',
         ('checkCanProcessRequest', 'org_admin')]
py_tasks_melange