# HG changeset patch
# User Aurelien Campeas <aurelien.campeas@logilab.fr>
# Date 1278599419 -7200
# Node ID 9cbde75fefe8ae93d4fbe2da53b9ed90d5da56a0
# Parent  b962dff47c3629be5747f4d4f0be07b46aa9f07a# Parent  846d1fb32aa8a13aed907f6de17542d8ff01f1b4
merge

diff -r b962dff47c36 -r 9cbde75fefe8 debian/control
--- a/debian/control	Thu Jul 08 15:36:33 2010 +0200
+++ b/debian/control	Thu Jul 08 16:30:19 2010 +0200
@@ -10,7 +10,7 @@
 Build-Depends: debhelper (>= 5), python-dev (>=2.5), python-central (>= 0.5)
 Standards-Version: 3.8.0
 Homepage: http://www.cubicweb.org
-XS-Python-Version: >= 2.5, << 2.6
+XS-Python-Version: >= 2.5, << 2.7
 
 Package: cubicweb
 Architecture: all
diff -r b962dff47c36 -r 9cbde75fefe8 web/views/reledit.py
--- a/web/views/reledit.py	Thu Jul 08 15:36:33 2010 +0200
+++ b/web/views/reledit.py	Thu Jul 08 16:30:19 2010 +0200
@@ -52,12 +52,11 @@
     _cancelclick = "cw.reledit.cleanupAfterCancel('%s')"
 
     # ui side actions/buttons
-    _addzone = (u'<img title="%(msg)s" src="data/plus.png" '
-                u'alt="%(msg)s"/>')
+    _addzone = u'<img title="%(msg)s" src="data/plus.png" alt="%(msg)s"/>'
     _addmsg = _('click to add a value')
-    _deletezone = (u'<img title="%(msg)s" src="data/cancel.png" alt="%(msg)s"/>')
+    _deletezone = u'<img title="%(msg)s" src="data/cancel.png" alt="%(msg)s"/>'
     _deletemsg = _('click to delete this value')
-    _editzone = (u'<img title="%(msg)s" src="data/pen_icon.png" alt="%(msg)s"/>')
+    _editzone = u'<img title="%(msg)s" src="data/pen_icon.png" alt="%(msg)s"/>'
     _editzonemsg = _('click to edit this field')
 
     # default relation vids according to cardinality
@@ -127,6 +126,9 @@
             form, renderer = self._build_form(entity, rtype, role, divid, formid, default_value,
                                               reload, dict(vid=rvid),
                                               edit_related, add_related and ttypes[0])
+            if formid == 'base':
+                field = form.field_by_name(rtype, role, entity.e_schema)
+                form.append_field(field)
             self.view_form(divid, value, form, renderer, edit_related,
                            delete_related, add_related)