# HG changeset patch # User Sylvain Thénault # Date 1285853701 -7200 # Node ID 9af007a3acb9c74d6226f552d778c9254c1ec5ad # Parent 8c3d6f739fa3eda69a03ceceb4e4ac6ff94b1edf fix bad merge diff -r 8c3d6f739fa3 -r 9af007a3acb9 web/views/primary.py --- a/web/views/primary.py Thu Sep 30 15:00:40 2010 +0200 +++ b/web/views/primary.py Thu Sep 30 15:35:01 2010 +0200 @@ -143,7 +143,7 @@ if display_attributes: self.w(u'') for rschema, role, dispctrl, value in display_attributes: - if support_args(self._render_attribute, 'label'): + if not hasattr(self, '_render_attribute'): label = self._rel_label(entity, rschema, role, dispctrl) self.render_attribute(label, value, table=True) elif support_args(self._render_attribute, 'dispctrl'):