equal
deleted
inserted
replaced
194 if isinstance(x, tuple): |
194 if isinstance(x, tuple): |
195 # x is a view box (label, rset, vid, dispctrl) |
195 # x is a view box (label, rset, vid, dispctrl) |
196 # default to 1000 so view boxes occurs after component boxes |
196 # default to 1000 so view boxes occurs after component boxes |
197 return x[-1].get('order', 1000) |
197 return x[-1].get('order', 1000) |
198 # x is a component box |
198 # x is a component box |
199 return x.propval('order') |
199 return x.cw_propval('order') |
200 return sorted(sideboxes, key=get_order) |
200 return sorted(sideboxes, key=get_order) |
201 |
201 |
202 def _section_def(self, entity, where): |
202 def _section_def(self, entity, where): |
203 rdefs = [] |
203 rdefs = [] |
204 eschema = entity.e_schema |
204 eschema = entity.e_schema |
253 |
253 |
254 def call(self, **kwargs): |
254 def call(self, **kwargs): |
255 # nb: rset retreived using entity.related with limit + 1 if any |
255 # nb: rset retreived using entity.related with limit + 1 if any |
256 # because of that, we known that rset.printable_rql() will return |
256 # because of that, we known that rset.printable_rql() will return |
257 # rql with no limit set anyway (since it's handled manually) |
257 # rql with no limit set anyway (since it's handled manually) |
258 if 'dispctrl' in self.extra_kwargs: |
258 if 'dispctrl' in self.cw_extra_kwargs: |
259 limit = self.extra_kwargs['dispctrl'].get('limit') |
259 limit = self.extra_kwargs['dispctrl'].get('limit') |
260 else: |
260 else: |
261 limit = None |
261 limit = None |
262 if limit is None or self.cw_rset.rowcount <= limit: |
262 if limit is None or self.cw_rset.rowcount <= limit: |
263 if self.cw_rset.rowcount == 1: |
263 if self.cw_rset.rowcount == 1: |