merge stable
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Sun, 15 Nov 2009 13:58:33 +0100
branchstable
changeset 3850 75023c2c34ee
parent 3847 7cf2b338a8e7 (current diff)
parent 3849 afba6d304e71 (diff)
child 3851 3a18a0a24411
child 3852 03121ca1f85e
merge
--- a/web/views/basecomponents.py	Fri Nov 13 15:36:09 2009 +0100
+++ b/web/views/basecomponents.py	Sun Nov 15 13:58:33 2009 +0100
@@ -225,9 +225,9 @@
     order = 1
 
     def cell_call(self, row, col, view=None):
-        print 'yhooo', self.rset
         self.wview('metadata', self.rset, row=row, col=col)
 
+
 def registration_callback(vreg):
     vreg.register_all(globals().values(), __name__, (SeeAlsoVComponent,))
     if 'see_also' in vreg.schema:
--- a/web/views/primary.py	Fri Nov 13 15:36:09 2009 +0100
+++ b/web/views/primary.py	Sun Nov 15 13:58:33 2009 +0100
@@ -45,7 +45,8 @@
 
     def render_entity(self, entity):
         self.render_entity_title(entity)
-        self.render_entity_toolbox(entity)
+        # XXX uncomment this in 3.6
+        #self.render_entity_toolbox(entity)
         # entity's attributes and relations, excluding meta data
         # if the entity isn't meta itself
         boxes = self._prepare_side_boxes(entity)
--- a/web/views/tabs.py	Fri Nov 13 15:36:09 2009 +0100
+++ b/web/views/tabs.py	Sun Nov 15 13:58:33 2009 +0100
@@ -188,7 +188,8 @@
     def cell_call(self, row, col):
         entity = self.complete_entity(row, col)
         self.render_entity_title(entity)
-        self.render_entity_toolbox(entity)
+        # XXX uncomment this in 3.6
+        #self.render_entity_toolbox(entity)
         self.render_tabs(self.tabs, self.default_tab, entity)