74 'Review %(name_short)s')] |
74 'Review %(name_short)s')] |
75 |
75 |
76 new_params['extra_django_patterns'] = patterns |
76 new_params['extra_django_patterns'] = patterns |
77 |
77 |
78 new_params['sidebar_additional'] = [ |
78 new_params['sidebar_additional'] = [ |
79 ('/%(url_name)s/review' % params, |
79 ('/%(url_name)s/review_overview' % params, |
80 'Review %(name_plural)s' % params, 'review_overview')] |
80 'Review %(name_plural)s' % params, 'review_overview')] |
81 |
81 |
82 new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'status', |
82 new_params['extra_dynaexclude'] = ['applicant', 'backup_admin', 'status', |
83 'created_on', 'last_modified_on'] |
83 'created_on', 'last_modified_on'] |
84 |
84 |
188 aa_params['list_action'] = (redirects.getApplicantRedirect, aa_params) |
188 aa_params['list_action'] = (redirects.getApplicantRedirect, aa_params) |
189 |
189 |
190 aa_list = list_helper.getListContent( |
190 aa_list = list_helper.getListContent( |
191 request, aa_params, filter, 1) |
191 request, aa_params, filter, 1) |
192 |
192 |
|
193 if is_developer: |
|
194 # re use the old filter, but this time only for pre-accepted apps |
|
195 filter['status'] = 'pre-accepted' |
|
196 |
|
197 pa_params = params.copy() # pre-accepted applications |
|
198 |
|
199 pa_params['list_description'] = ugettext( |
|
200 "An overview of all pre-accepted %(name_plural)s.") % params |
|
201 |
|
202 pa_list = list_helper.getListContent( |
|
203 request, pa_params, filter, 4) |
|
204 |
|
205 contents += [pa_list] |
|
206 |
193 # get all the reviewed applications that were denied |
207 # get all the reviewed applications that were denied |
194 |
208 |
195 # re use the old filter, but this time only for denied apps |
209 # re use the old filter, but this time only for denied apps |
196 filter['status'] = 'rejected' |
210 filter['status'] = 'rejected' |
197 |
211 |
255 |
269 |
256 # check to see if we can make a decision for this application |
270 # check to see if we can make a decision for this application |
257 if 'status' in get_dict.keys(): |
271 if 'status' in get_dict.keys(): |
258 status_value = get_dict['status'] |
272 status_value = get_dict['status'] |
259 |
273 |
260 if status_value in ['accepted', 'rejected', 'ignored']: |
274 if status_value in ['accepted', 'rejected', 'ignored', 'pre-accepted']: |
261 # this application has been properly reviewed update the status |
275 # this application has been properly reviewed update the status |
262 |
276 |
263 # only update if the status changes |
277 # only update if the status changes |
264 if entity.status != status_value: |
278 if entity.status != status_value: |
265 fields = {'status' : status_value} |
279 fields = {'status' : status_value} |
310 'that have been accepted but not completed yet') % params |
324 'that have been accepted but not completed yet') % params |
311 uh_params ['list_action'] = (redirects.getReviewRedirect, params) |
325 uh_params ['list_action'] = (redirects.getReviewRedirect, params) |
312 |
326 |
313 uh_list = list_helper.getListContent( |
327 uh_list = list_helper.getListContent( |
314 request, uh_params, filter, 1) |
328 request, uh_params, filter, 1) |
|
329 |
|
330 # only select the requests that have been pre-accpeted |
|
331 filter['status'] = 'pre-accepted' |
|
332 |
|
333 pa_params = params.copy() |
|
334 pa_params['list_description'] = ugettext( |
|
335 "An overview of all pre-accepted %(name_plural)s.") % params |
|
336 pa_params ['list_action'] = (redirects.getReviewRedirect, params) |
|
337 |
|
338 pa_list = list_helper.getListContent( |
|
339 request, pa_params, filter, 4) |
315 |
340 |
316 # only select the requests the have been rejected |
341 # only select the requests the have been rejected |
317 filter ['status'] = 'rejected' |
342 filter ['status'] = 'rejected' |
318 |
343 |
319 den_params = params.copy() |
344 den_params = params.copy() |
334 |
359 |
335 ign_list = list_helper.getListContent( |
360 ign_list = list_helper.getListContent( |
336 request, ign_params, filter, 3) |
361 request, ign_params, filter, 3) |
337 |
362 |
338 # fill contents with all the needed lists |
363 # fill contents with all the needed lists |
339 contents = [ur_list, uh_list, den_list, ign_list] |
364 contents = [ur_list, uh_list, pa_list, den_list, ign_list] |
340 |
365 |
341 # call the _list method from base to display the list |
366 # call the _list method from base to display the list |
342 return self._list(request, params, contents, page_name) |
367 return self._list(request, params, contents, page_name) |
343 |
368 |