comparison piecrust/data/paginator.py @ 289:9b75b49a4084

data: Don't nest filters in the paginator -- nest clauses instead.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 05 Mar 2015 00:27:01 -0800
parents 8c0c53a315ae
children b7ab1b503510
comparison
equal deleted inserted replaced
288:078e64dba77d 289:9b75b49a4084
203 f.addClause(self._pgn_filter.root_clause) 203 f.addClause(self._pgn_filter.root_clause)
204 204
205 if isinstance(self._source, IPaginationSource): 205 if isinstance(self._source, IPaginationSource):
206 sf = self._source.getPaginationFilter(self._parent_page) 206 sf = self._source.getPaginationFilter(self._parent_page)
207 if sf is not None: 207 if sf is not None:
208 f.addClause(sf) 208 f.addClause(sf.root_clause)
209 209
210 return f 210 return f
211 211
212 def _getPageUri(self, index): 212 def _getPageUri(self, index):
213 uri = self._uri 213 uri = self._uri