merge
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Tue, 19 Jan 2010 12:27:55 +0100
changeset 4263 c541602a309d
parent 4262 83d245d33436 (diff)
parent 4260 832b578839cb (current diff)
child 4264 273307c54b4d
merge
--- a/web/uicfg.py	Tue Jan 19 11:58:07 2010 +0100
+++ b/web/uicfg.py	Tue Jan 19 12:27:55 2010 +0100
@@ -437,8 +437,8 @@
         warn('autoform_is_inlined rtag is deprecated, use autoform_section '
              'with inlined formtype and "attributes" or "hidden" section',
              DeprecationWarning, stacklevel=2)
-        section = tag and 'attributes' or 'hidden'
-        autoform_section.tag_relation(key, 'inlined', section)
+        section = tag and 'inlined' or 'hidden'
+        autoform_section.tag_relation(key, 'main', section)
 
 # inlined view flag for non final relations: when True for an entry, the
 # entity(ies) at the other end of the relation will be editable from the
--- a/web/views/iprogress.py	Tue Jan 19 11:58:07 2010 +0100
+++ b/web/views/iprogress.py	Tue Jan 19 12:27:55 2010 +0100
@@ -87,7 +87,7 @@
 
     def header_for_milestone(self, ecls):
         """use entity's type as label"""
-        return display_name(self._cw, ecls.id)
+        return display_name(self._cw, ecls.__regid__)
 
     def table_header(self, ecls):
         """builds the table's header"""