Fixing r1855 that was bugged by Tortoise ^_^.
Patch by: Lennard de Rijk
Reviewed by: to-be-reviewed
--- a/app/soc/views/models/club_app.py Sat Feb 07 21:48:02 2009 +0000
+++ b/app/soc/views/models/club_app.py Sat Feb 07 22:10:19 2009 +0000
@@ -85,6 +85,10 @@
new_params['review_template'] = 'soc/club_app/review.html'
+ new_params['sidebar_additional'] = [
+ ('/%(url_name)s/review_overview/' % new_params,
+ 'Review %(name_plural)s' % new_params, 'review_overview')]
+
params = dicts.merge(params, new_params)
super(View, self).__init__(params=params)
--- a/app/soc/views/models/group_app.py Sat Feb 07 21:48:02 2009 +0000
+++ b/app/soc/views/models/group_app.py Sat Feb 07 22:10:19 2009 +0000
@@ -66,7 +66,7 @@
new_params['create_template'] = 'soc/models/twoline_edit.html'
new_params['edit_template'] = 'soc/models/twoline_edit.html'
- patterns = [(r'^%(url_name)s/(?P<access_type>review_overview)$',
+ patterns = [(r'^%(url_name)s/(?P<access_type>review_overview)/%(scope)s$',
'soc.views.models.%(module_name)s.review_overview',
'Review %(name_plural)s'),
(r'^%(url_name)s/(?P<access_type>review)/%(key_fields)s$',
@@ -75,10 +75,6 @@
new_params['extra_django_patterns'] = patterns
- new_params['sidebar_additional'] = [
- ('/%(url_name)s/review_overview' % params,
- 'Review %(name_plural)s' % params, 'review_overview')]
-
new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'status',
'created_on', 'last_modified_on']
@@ -305,8 +301,13 @@
params = dicts.merge(params, self._params)
+ filter = {}
+
+ if kwargs['scope_path']:
+ filter['scope_path'] = kwargs['scope_path']
+
# only select the requests that haven't been reviewed yet
- filter = {'status' : 'needs review'}
+ filter['status'] = 'needs review'
ur_params = params.copy()
ur_params['list_description'] = ugettext('A list of all unhandled '
--- a/app/soc/views/models/org_app.py Sat Feb 07 21:48:02 2009 +0000
+++ b/app/soc/views/models/org_app.py Sat Feb 07 22:10:19 2009 +0000
@@ -63,7 +63,7 @@
# TODO(ljvderijk) fix host access check
rights['review'] = ['checkIsHostForProgram',
('checkCanReviewGroupApp', [org_app_logic.logic])]
- rights['review_overview'] = ['checkIsDeveloper']
+ rights['review_overview'] = ['checkIsHostForProgram']
rights['apply'] = ['checkIsUser',
('checkCanCreateOrgApp', ['org_signup'])]