view.py
changeset 3998 94cc7cad3d2d
parent 3890 d7a270f50f54
parent 3973 1c09d2fd38c5
child 4045 f4a52abb6f4f
--- a/view.py	Mon Nov 23 14:13:53 2009 +0100
+++ b/view.py	Thu Dec 03 17:17:43 2009 +0100
@@ -179,6 +179,7 @@
         if rset is None:
             raise NotImplementedError, self
         wrap = self.templatable and len(rset) > 1 and self.add_div_section
+        # XXX propagate self.extra_kwars?
         for i in xrange(len(rset)):
             if wrap:
                 self.w(u'<div class="section">')
@@ -200,7 +201,7 @@
         return True
 
     def is_primary(self):
-        return self.__regid__ == 'primary'
+        return self.extra_kwargs.get('is_primary', self.__regid__ == 'primary')
 
     def url(self):
         """return the url associated with this view. Should not be
@@ -323,7 +324,10 @@
             else:
                 w(u'<span>%s</span> ' % label)
         if table:
-            w(u'<td>%s</td></tr>' % value)
+            if not (show_label and label):
+                w(u'<td colspan="2">%s</td></tr>' % value)
+            else:
+                w(u'<td>%s</td></tr>' % value)
         else:
             w(u'<span>%s</span></div>' % value)