# HG changeset patch # User Sylvain Thénault # Date 1255964611 -7200 # Node ID 55e57070a969bc79481c72e944ef778bfcbeedc8 # Parent e5ab08bb0d605b8e629c8349ebd2e63553fa1f15 bad merge diff -r e5ab08bb0d60 -r 55e57070a969 web/views/primary.py --- a/web/views/primary.py Mon Oct 19 16:51:13 2009 +0200 +++ b/web/views/primary.py Mon Oct 19 17:03:31 2009 +0200 @@ -187,7 +187,7 @@ def _render_relation(self, rset, dispctrl, defaultvid, showlabel): self.w(u'
') if showlabel: - self.w(u'

%s

' % self._cw._(dispctrl['label'])) + self.w(u'

%s

' % self._cw._(dispctrl['label']), initargs={'dispctrl': dispctrl}) self.w(u'
')