web/views/basecontrollers.py
branchtls-sprint
changeset 882 75488a2a875e
parent 823 cb8ccbef8fa5
child 945 912b604f0e42
equal deleted inserted replaced
881:18e6c8db7bc5 882:75488a2a875e
    64     def publish(self, rset=None):
    64     def publish(self, rset=None):
    65         """publish a request, returning an encoded string"""
    65         """publish a request, returning an encoded string"""
    66         view, rset = self._select_view_and_rset(rset)
    66         view, rset = self._select_view_and_rset(rset)
    67         self.add_to_breadcrumbs(view)
    67         self.add_to_breadcrumbs(view)
    68         self.validate_cache(view)
    68         self.validate_cache(view)
    69         template = self.req.property_value('ui.main-template')
    69         template = self.appli.main_template_id(self.req)
    70         if template not in self.vreg.registry('views') :
       
    71             template = self.template
       
    72         return self.vreg.main_template(self.req, template, rset=rset, view=view)
    70         return self.vreg.main_template(self.req, template, rset=rset, view=view)
    73 
    71 
    74     def _select_view_and_rset(self, rset):
    72     def _select_view_and_rset(self, rset):
    75         req = self.req
    73         req = self.req
    76         if rset is None and not hasattr(req, '_rql_processed'):
    74         if rset is None and not hasattr(req, '_rql_processed'):