# HG changeset patch
# User Adrien Di Mascio <Adrien.DiMascio@logilab.fr>
# Date 1246285087 -7200
# Node ID c8c8ef5c5c6563b7f95bdfa0c8b546f417e18e4f
# Parent  667b6340bfd49c0b5e6de6e6e8343844c72d4d5e# Parent  d9f5fd1879fc2ae40c11cd6297065cb879038439
merge

diff -r 667b6340bfd4 -r c8c8ef5c5c65 server/session.py
--- a/server/session.py	Mon Jun 29 16:16:43 2009 +0200
+++ b/server/session.py	Mon Jun 29 16:18:07 2009 +0200
@@ -317,6 +317,7 @@
                     self.critical('rollback error', exc_info=sys.exc_info())
                     continue
             self.pool.rollback()
+            self.debug('rollback for session %s done', self.id)
         finally:
             self._touch()
             self.pending_operations[:] = []
diff -r 667b6340bfd4 -r c8c8ef5c5c65 web/views/primary.py
--- a/web/views/primary.py	Mon Jun 29 16:16:43 2009 +0200
+++ b/web/views/primary.py	Mon Jun 29 16:18:07 2009 +0200
@@ -119,7 +119,19 @@
 
     def render_entity_attributes(self, entity, siderelations=None):
         for rschema, tschemas, role, dispctrl in self._section_def(entity, 'attributes'):
-            vid =  dispctrl.get('vid', 'reledit')
+            # don't use reledit as default vid for composite relation
+            if rschema.is_final():
+                defaultvid = 'reledit'
+            # XXX use entity.e_schema.role_rproperty(role, rschema, 'composite', tschemas[0]) once yams > 0.23.0 is out
+            elif role == 'subject' and \
+                 rschema.rproperty(entity.e_schema, tschemas[0], 'composite'):
+                defaultvid = 'csv'
+            elif role == 'object' and \
+                 rschema.rproperty(tschemas[0], entity.e_schema, 'composite'):
+                defaultvid = 'csv'
+            else:
+                defaultvid = 'reledit'
+            vid =  dispctrl.get('vid', defaultvid)
             if rschema.is_final() or vid == 'reledit':
                 value = entity.view(vid, rtype=rschema.type, role=role)
             else: