diff -r aa04ccb8dd62 -r 0f2ded880d01 web/views/tableview.py --- a/web/views/tableview.py Mon Jun 07 12:39:15 2010 +0200 +++ b/web/views/tableview.py Mon Jun 07 13:22:24 2010 +0200 @@ -46,7 +46,7 @@ finalview = 'final' def form_filter(self, divid, displaycols, displayactions, displayfilter, - hidden=True): + paginate, hidden=True): rqlst = self.cw_rset.syntax_tree() # union not yet supported if len(rqlst.children) != 1: @@ -60,7 +60,8 @@ wdgs = [wdg for wdg in wdgs if wdg is not None] if wdgs: self._generate_form(divid, baserql, wdgs, hidden, - vidargs={'displaycols': displaycols, + vidargs={'paginate': paginate, + 'displaycols': displaycols, 'displayactions': displayactions, 'displayfilter': displayfilter}) return self.show_hide_actions(divid, not hidden) @@ -162,19 +163,16 @@ self.w(u'

%s

\n' % title) if displayfilter: actions += self.form_filter(divid, displaycols, displayfilter, - displayactions) + displayactions, paginate) elif displayfilter: actions += self.show_hide_actions(divid, True) - self.w(u'
' % divid) if displayactions: actionsbycat = self._cw.vreg['actions'].possible_actions(req, self.cw_rset) for action in actionsbycat.get('mainactions', ()): for action in action.actual_actions(): actions.append( (action.url(), req._(action.title), action.html_class(), None) ) - self.w(u' cubicweb:displayactions="1">') # close
') # close