# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1241047308 -7200
# Node ID f63d090eb34a5e4f81acedbb48a8c736339f920b
# Parent  d2d5428c7a3819eb8bec5e225d5daacb3e6095fb
some primary view fixes, need more (eg reledit doesn't work for non final relation

diff -r d2d5428c7a38 -r f63d090eb34a web/views/primary.py
--- a/web/views/primary.py	Thu Apr 30 01:20:59 2009 +0200
+++ b/web/views/primary.py	Thu Apr 30 01:21:48 2009 +0200
@@ -84,14 +84,14 @@
         # if the entity isn't meta itself
         boxes = self._prepare_side_boxes(entity)
         if boxes or hasattr(self, 'render_side_related'):
-            self.w(u'<table width="100%"><tr><td width="75%">')
+            self.w(u'<table width="100%"><tr><td style="width: 75%">')
         self.w(u'<div>')
         self.w(u'<div class="mainInfo">')
         try:
             self.render_entity_attributes(entity)
         except TypeError: # XXX bw compat
             warn('siderelations argument of render_entity_attributes is '
-                 'deprecated')
+                 'deprecated (%s)' % self.__class__)
             self.render_entity_attributes(entity, [])
         self.w(u'</div>')
         self.content_navigation_components('navcontenttop')
@@ -153,13 +153,12 @@
     def render_entity_attributes(self, entity, siderelations=None):
         for rschema, tschemas, role, displayinfo in self._iter_display(entity, 'attributes'):
             vid =  displayinfo.get('vid', 'reledit')
-            if rschema.is_final():
-                value = entity.view('reledit', rtype=rschema.type)
+            if rschema.is_final() or vid == 'reledit':
+                value = entity.view(vid, rtype=rschema.type, role=role)
             else:
-                vid =  displayinfo.get('vid', 'reledit')
                 rset = self._relation_rset(entity, rschema, role, displayinfo)
                 if rset:
-                    value = self.view(rset, vid)
+                    value = self.view(vid, rset)
                 else:
                     value = None
             if self.skip_none and (value is None or value == ''):