web/views/primary.py
changeset 9257 ce338133c92c
parent 9255 46f41c3e1443
child 10006 8391bf718485
child 10179 a328b91938b2
equal deleted inserted replaced
9256:697a8181ba30 9257:ce338133c92c
   211             if value is not None and value != '':
   211             if value is not None and value != '':
   212                 display_attributes.append( (rschema, role, dispctrl, value) )
   212                 display_attributes.append( (rschema, role, dispctrl, value) )
   213         if display_attributes:
   213         if display_attributes:
   214             self.w(u'<table>')
   214             self.w(u'<table>')
   215             for rschema, role, dispctrl, value in display_attributes:
   215             for rschema, role, dispctrl, value in display_attributes:
   216                 # pylint: disable=E1101
   216                 label = self._rel_label(entity, rschema, role, dispctrl)
   217                 if not hasattr(self, '_render_attribute'):
   217                 self.render_attribute(label, value, table=True)
   218                     label = self._rel_label(entity, rschema, role, dispctrl)
       
   219                     self.render_attribute(label, value, table=True)
       
   220                 else:
       
   221                     warn('[3.9] _render_attribute prototype has changed and '
       
   222                          'renamed to render_attribute, please update %s'
       
   223                          % self.__class__, DeprecationWarning)
       
   224                     self._render_attribute(dispctrl, rschema, value, role=role,
       
   225                                            table=True)
       
   226             self.w(u'</table>')
   218             self.w(u'</table>')
   227 
   219 
   228     def render_attribute(self, label, value, table=False):
   220     def render_attribute(self, label, value, table=False):
   229         self.field(label, value, tr=False, table=table)
   221         self.field(label, value, tr=False, table=table)
   230 
   222 
   246             else:
   238             else:
   247                 vid = dispctrl.get('vid', 'autolimited')
   239                 vid = dispctrl.get('vid', 'autolimited')
   248                 limit = defaultlimit if vid == 'autolimited' else None
   240                 limit = defaultlimit if vid == 'autolimited' else None
   249                 rset = self._relation_rset(entity, rschema, role, dispctrl, limit=limit)
   241                 rset = self._relation_rset(entity, rschema, role, dispctrl, limit=limit)
   250                 if not rset:
   242                 if not rset:
   251                     continue
       
   252                 if hasattr(self, '_render_relation'):
       
   253                     # pylint: disable=E1101
       
   254                     self._render_relation(dispctrl, rset, 'autolimited')
       
   255                     warn('[3.9] _render_relation prototype has changed and has '
       
   256                          'been renamed to render_relation, please update %s'
       
   257                          % self.__class__, DeprecationWarning)
       
   258                     continue
   243                     continue
   259                 try:
   244                 try:
   260                     rview = self._cw.vreg['views'].select(
   245                     rview = self._cw.vreg['views'].select(
   261                         vid, self._cw, rset=rset, dispctrl=dispctrl)
   246                         vid, self._cw, rset=rset, dispctrl=dispctrl)
   262                 except NoSelectableObject:
   247                 except NoSelectableObject: