# HG changeset patch # User Sylvain Thénault # Date 1296110752 -3600 # Node ID 20f63f716f0e013529e3021f61f00797ff3e990b # Parent 118e78f6e4e4e424a44d536cd9ea0888959801af [uicfg] fix reledit rtag initialization for final relations diff -r 118e78f6e4e4 -r 20f63f716f0e web/uicfg.py --- a/web/uicfg.py Thu Jan 27 07:45:14 2011 +0100 +++ b/web/uicfg.py Thu Jan 27 07:45:52 2011 +0100 @@ -402,23 +402,22 @@ return super(ReleditTags, self).tag_relation(key, tag) def init_reledit_ctrl(rtag, sschema, rschema, oschema, role): - if rschema.final: - return - composite = rschema.rdef(sschema, oschema).composite == role - if role == 'subject': - oschema = '*' - else: - sschema = '*' values = rtag.get(sschema, rschema, oschema, role) - edittarget = values.get('edit_target') - if edittarget not in (None, 'rtype', 'related'): - rtag.warning('reledit: wrong value for edit_target on relation %s: %s', - rschema, edittarget) - edittarget = None - if not edittarget: - edittarget = 'related' if composite else 'rtype' - rtag.tag_relation((sschema, rschema, oschema, role), - {'edit_target': edittarget}) + if not rschema.final: + composite = rschema.rdef(sschema, oschema).composite == role + if role == 'subject': + oschema = '*' + else: + sschema = '*' + edittarget = values.get('edit_target') + if edittarget not in (None, 'rtype', 'related'): + rtag.warning('reledit: wrong value for edit_target on relation %s: %s', + rschema, edittarget) + edittarget = None + if not edittarget: + edittarget = 'related' if composite else 'rtype' + rtag.tag_relation((sschema, rschema, oschema, role), + {'edit_target': edittarget}) if not 'novalue_include_rtype' in values: showlabel = primaryview_display_ctrl.get( sschema, rschema, oschema, role).get('showlabel', True)