[table view, workflow] fix the display of wf history table (closes: #2065652)
authorAlexandre Fayolle <alexandre.fayolle@logilab.fr>
Fri, 28 Oct 2011 17:54:24 +0200
changeset 8050 0f3a54c37b05
parent 8049 a48301a44b50
child 8051 41398fa1a90f
[table view, workflow] fix the display of wf history table (closes: #2065652) was relying on no more used 'cell' view
web/views/workflow.py
--- a/web/views/workflow.py	Thu Nov 03 15:28:30 2011 +0100
+++ b/web/views/workflow.py	Fri Oct 28 17:54:24 2011 +0200
@@ -136,17 +136,17 @@
     def cell_call(self, row, col, view=None, title=title):
         _ = self._cw._
         eid = self.cw_rset[row][col]
-        sel = 'Any FS,TS,WF,D'
+        sel = 'Any FS,TS,C,D'
         rql = ' ORDERBY D DESC WHERE WF wf_info_for X,'\
               'WF from_state FS, WF to_state TS, WF comment C,'\
               'WF creation_date D'
         if self._cw.vreg.schema.eschema('CWUser').has_perm(self._cw, 'read'):
-            sel += ',U,C'
+            sel += ',U,WF'
             rql += ', WF owned_by U?'
             headers = (_('from_state'), _('to_state'), _('comment'), _('date'),
                        _('CWUser'))
         else:
-            sel += ',C'
+            sel += ',WF'
             headers = (_('from_state'), _('to_state'), _('comment'), _('date'))
         rql = '%s %s, X eid %%(x)s' % (sel, rql)
         try:
@@ -156,7 +156,8 @@
         if rset:
             if title:
                 self.w(u'<h2>%s</h2>\n' % _(title))
-            self.wview('table', rset, headers=headers)
+            self.wview('table', rset, headers=headers,
+                       cellvids={2: 'editable-final'})
 
 
 class WFHistoryVComponent(component.EntityCtxComponent):
@@ -245,14 +246,6 @@
     default_tab = 'wf_tab_info'
 
 
-class CellView(EntityView):
-    __regid__ = 'cell'
-    __select__ = is_instance('TrInfo')
-
-    def cell_call(self, row, col, cellvid=None):
-        self.w(self.cw_rset.get_entity(row, col).view('reledit', rtype='comment'))
-
-
 class StateInContextView(EntityView):
     """convenience trick, State's incontext view should not be clickable"""
     __regid__ = 'incontext'