web/views/basecontrollers.py
branchstable
changeset 4637 3e5e5a234d09
parent 4636 edafa2343dd7
child 4638 c7d2145abf61
equal deleted inserted replaced
4636:edafa2343dd7 4637:3e5e5a234d09
   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
       
   354             view = self._cw.vreg['views'].select(vid, req, rset=rset)
   353             view = self._cw.vreg['views'].select(vid, req, rset=rset)
   355 =======
       
   356             view = self.vreg['views'].select(vid, req, rset=rset)
   354             view = self.vreg['views'].select(vid, req, rset=rset)
   357         self.validate_cache(view)
       
   358 >>>>>>> /tmp/basecontrollers.py~other.stRkG5
       
   359         return self._call_view(view)
   355         return self._call_view(view)
   360 
   356 
   361     @xhtmlize
   357     @xhtmlize
   362     def js_prop_widget(self, propkey, varname, tabindex=None):
   358     def js_prop_widget(self, propkey, varname, tabindex=None):
   363         """specific method for CWProperty handling"""
   359         """specific method for CWProperty handling"""