# HG changeset patch # User Sylvain Thénault # Date 1243435311 -7200 # Node ID c519a37193e1450705c231fea8bb6530e96b7a41 # Parent 87ce7d336393be16d7e7c4c34863a1704e4e58b9# Parent f14f8465269d02291f2e870142a4a2e8ea8cd009 backport stable branch diff -r 87ce7d336393 -r c519a37193e1 web/formrenderers.py --- a/web/formrenderers.py Wed May 27 15:19:25 2009 +0200 +++ b/web/formrenderers.py Wed May 27 16:41:51 2009 +0200 @@ -390,6 +390,8 @@ def inline_entities_form(self, w, form): """create a form to edit entity's inlined relations""" + if not hasattr(form, 'inlined_relations'): + return entity = form.edited_entity __ = form.req.__ for rschema, targettypes, role in form.inlined_relations(): @@ -456,6 +458,9 @@ '#1 ' '[%(removemsg)s]' % values) + # cleanup values + for key in ('title', 'removejs', 'removemsg'): + values.pop(key) self.render_fields(w, form, values) w(u'') return '\n'.join(data) diff -r 87ce7d336393 -r c519a37193e1 web/formwidgets.py diff -r 87ce7d336393 -r c519a37193e1 web/views/autoform.py --- a/web/views/autoform.py Wed May 27 15:19:25 2009 +0200 +++ b/web/views/autoform.py Wed May 27 16:41:51 2009 +0200 @@ -189,7 +189,8 @@ """ # we'll need an initialized varmaker if there are some inlined relation self.initialize_varmaker() - return self.erelations_by_category(self.edited_entity, True, 'add', self.rinlined) + return self.erelations_by_category(self.edited_entity, True, 'add', + self.rinlined) def srelations_by_category(self, categories=None, permission=None): """filter out result of relations_by_category(categories, permission) by diff -r 87ce7d336393 -r c519a37193e1 web/views/basecomponents.py --- a/web/views/basecomponents.py Wed May 27 15:19:25 2009 +0200 +++ b/web/views/basecomponents.py Wed May 27 16:41:51 2009 +0200 @@ -20,7 +20,7 @@ BoxLink) VISIBLE_PROP_DEF = { - _('visible'): dict(type='Boolean', default=False, + _('visible'): dict(type='Boolean', default=True, help=_('display the component or not')), } @@ -125,9 +125,8 @@ """ __select__ = yes() id = 'applmessages' - property_defs = VISIBLE_PROP_DEF # don't want user to hide this component using an cwproperty - site_wide = True + property_defs = {} def call(self): msgs = [msg for msg in (self.req.get_shared_data('sources_error', pop=True), diff -r 87ce7d336393 -r c519a37193e1 web/views/editforms.py --- a/web/views/editforms.py Wed May 27 15:19:25 2009 +0200 +++ b/web/views/editforms.py Wed May 27 16:41:51 2009 +0200 @@ -6,6 +6,7 @@ :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr """ __docformat__ = "restructuredtext en" +_ = unicode from copy import copy @@ -26,7 +27,6 @@ EntityCompositeFormRenderer, EntityInlinedFormRenderer) -_ = unicode def relation_id(eid, rtype, role, reid): """return an identifier for a relation between two entities"""