web/views/basecontrollers.py
branchstable
changeset 4636 edafa2343dd7
parent 4629 1eeef3cbf528
parent 4557 a0571ff0cb5d
child 4637 3e5e5a234d09
equal deleted inserted replaced
4635:44a883148ab4 4636:edafa2343dd7
   348         vid = req.form.get('vid') or vid_from_rset(req, rset, self._cw.vreg.schema)
   348         vid = req.form.get('vid') or vid_from_rset(req, rset, self._cw.vreg.schema)
   349         try:
   349         try:
   350             view = self._cw.vreg['views'].select(vid, req, rset=rset)
   350             view = self._cw.vreg['views'].select(vid, req, rset=rset)
   351         except NoSelectableObject:
   351         except NoSelectableObject:
   352             vid = req.form.get('fallbackvid', 'noresult')
   352             vid = req.form.get('fallbackvid', 'noresult')
       
   353 <<<<<<< /home/syt/src/fcubicweb/cubicweb/web/views/basecontrollers.py
   353             view = self._cw.vreg['views'].select(vid, req, rset=rset)
   354             view = self._cw.vreg['views'].select(vid, req, rset=rset)
       
   355 =======
       
   356             view = self.vreg['views'].select(vid, req, rset=rset)
       
   357         self.validate_cache(view)
       
   358 >>>>>>> /tmp/basecontrollers.py~other.stRkG5
   354         return self._call_view(view)
   359         return self._call_view(view)
   355 
   360 
   356     @xhtmlize
   361     @xhtmlize
   357     def js_prop_widget(self, propkey, varname, tabindex=None):
   362     def js_prop_widget(self, propkey, varname, tabindex=None):
   358         """specific method for CWProperty handling"""
   363         """specific method for CWProperty handling"""