# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1263900475 -3600
# Node ID c541602a309d8b8123f8cb02f1fc6dad3ad87982
# Parent  83d245d3343667ba10b74b4bb8bf5102c046444a# Parent  832b578839cb1ac30cec850c5d52a48597d0b23d
merge

diff -r 832b578839cb -r c541602a309d web/uicfg.py
--- 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
diff -r 832b578839cb -r c541602a309d web/views/iprogress.py
--- 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"""