app/soc/views/models/base.py
changeset 2609 dc0d4c3d9d2e
parent 2333 221482a54238
child 2747 915fe7338a72
equal deleted inserted replaced
2608:d97bafb60f0e 2609:dc0d4c3d9d2e
   280       page_name: the page name displayed in templates as page and header title
   280       page_name: the page name displayed in templates as page and header title
   281       params: a dict with params for this View
   281       params: a dict with params for this View
   282       kwargs: not used for create()
   282       kwargs: not used for create()
   283     """
   283     """
   284 
   284 
   285     new_params = dicts.merge(params, self._params)
   285     params = dicts.merge(params, self._params)
   286 
   286 
   287     # redirect to scope selection view
   287     # redirect to scope selection view
   288     if ('scope_view' in new_params) and ('scope_path' not in kwargs):
   288     if ('scope_view' in params) and ('scope_path' not in kwargs):
   289       view = new_params['scope_view'].view
   289       view = params['scope_view'].view
   290       redirect = new_params['scope_redirect']
   290       redirect = params['scope_redirect']
   291       return self.select(request, view, redirect,
   291       return self.select(request, view, redirect,
   292                          params=params, page_name=page_name, **kwargs)
   292                          params=params, page_name=page_name, **kwargs)
   293 
       
   294     params = new_params
       
   295 
   293 
   296     context = helper.responses.getUniversalContext(request)
   294     context = helper.responses.getUniversalContext(request)
   297     helper.responses.useJavaScript(context, params['js_uses_all'])
   295     helper.responses.useJavaScript(context, params['js_uses_all'])
   298     context['page_name'] = page_name
   296     context['page_name'] = page_name
   299 
   297 
   660       redirect: the redirect to use
   658       redirect: the redirect to use
   661       page_name: the page name displayed in templates as page and header title
   659       page_name: the page name displayed in templates as page and header title
   662       params: a dict with params for this View
   660       params: a dict with params for this View
   663       filter: a filter that all displayed entities should satisfy
   661       filter: a filter that all displayed entities should satisfy
   664     """
   662     """
   665 
   663     view_params = view.getParams().copy()
   666     params = dicts.merge(params, view.getParams())
   664     view_params['list_action'] = (redirect, params)
   667     params = dicts.merge(params, self._params)
   665     view_params['list_description'] = self.DEF_CREATE_INSTRUCTION_MSG_FMT % (
   668     params['list_action'] = (redirect, self._params)
   666         view_params['name'], self._params['name'])
   669     params['list_description'] = self.DEF_CREATE_INSTRUCTION_MSG_FMT % (
   667 
   670         params['name'], self._params['name'])
   668     content = helper.lists.getListContent(request, view_params, filter=filter)
   671 
       
   672     content = helper.lists.getListContent(request, params, filter=filter)
       
   673     contents = [content]
   669     contents = [content]
   674 
   670 
   675     return self._list(request, params, contents, page_name)
   671     return self._list(request, params, contents, page_name)
   676 
   672 
   677   def _getData(self, model, filter, order, logic):
   673   def _getData(self, model, filter, order, logic):