merge stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Wed, 07 Oct 2009 15:09:20 +0200
branchstable
changeset 3598 b4a2bad9c26a
parent 3597 de066e1b4c36 (diff)
parent 3596 8719de6d7155 (current diff)
child 3599 e64574673827
merge
--- a/web/uicfg.py	Wed Oct 07 14:50:33 2009 +0200
+++ b/web/uicfg.py	Wed Oct 07 15:09:20 2009 +0200
@@ -184,12 +184,7 @@
                 card = rschema.rproperty(sschema, oschema, 'cardinality')[1]
                 composed = rschema.rproperty(sschema, oschema, 'composite') == 'subject'
             if card in '1+':
-                if not rschema.is_final() and composed:
-                    # XXX why? probably because we want it unlined, though this
-                    # is not the case by default
-                    section = 'generated'
-                else:
-                    section = 'primary'
+                section = 'primary'
             elif rschema.is_final():
                 section = 'secondary'
             else: