283 |
283 |
284 contents = [] |
284 contents = [] |
285 new_list = lists.getListContent( |
285 new_list = lists.getListContent( |
286 request, new_params, filter, idx=1, need_content=True) |
286 request, new_params, filter, idx=1, need_content=True) |
287 |
287 |
|
288 ineligible_params = list_params.copy() # new proposals |
|
289 ineligible_params['list_description'] = 'List of ineligible %s sent to %s ' % ( |
|
290 ineligible_params['name_plural'], org_entity.name) |
|
291 ineligible_params['list_action'] = (redirects.getReviewRedirect, ineligible_params) |
|
292 |
|
293 filter = {'org': org_entity, |
|
294 'status': 'invalid'} |
|
295 |
|
296 contents = [] |
|
297 ineligible_list = lists.getListContent( |
|
298 request, ineligible_params, filter, idx=1, need_content=False) |
|
299 |
288 # fill contents with all the needed lists |
300 # fill contents with all the needed lists |
289 if new_list != None: |
301 if new_list != None: |
290 contents.append(new_list) |
302 contents.append(new_list) |
|
303 |
291 contents.append(prop_list) |
304 contents.append(prop_list) |
|
305 |
|
306 if ineligible_list != None: |
|
307 contents.append(ineligible_list) |
292 |
308 |
293 # call the _list method from base to display the list |
309 # call the _list method from base to display the list |
294 return self._list(request, list_params, contents, page_name, context) |
310 return self._list(request, list_params, contents, page_name, context) |
295 |
311 |
296 @decorators.merge_params |
312 @decorators.merge_params |