# HG changeset patch # User Sylvain Thénault # Date 1284991125 -7200 # Node ID f6cba3be6ba2a441b62b62d87cc6bbfb1788405b # Parent f68dd9dd3af2049d14fa42ac3c98aae789611f82 [primary view] we should not limit related rset, else if something else than autolimited view is used, some content will be missed without a 'view all' link diff -r f68dd9dd3af2 -r f6cba3be6ba2 web/views/primary.py --- a/web/views/primary.py Mon Sep 20 15:50:12 2010 +0200 +++ b/web/views/primary.py Mon Sep 20 15:58:45 2010 +0200 @@ -53,7 +53,6 @@ def cell_call(self, row, col): self.cw_row = row self.cw_col = col - self.maxrelated = self._cw.property_value('navigation.related-limit') entity = self.cw_rset.complete_entity(row, col) self.render_entity(entity) @@ -246,11 +245,7 @@ def _relation_rset(self, entity, rschema, role, dispctrl): try: - dispctrl.setdefault('limit', self.maxrelated) - limit = dispctrl['limit'] - if limit is not None: - limit += 1 - rset = entity.related(rschema.type, role, limit=limit) + rset = entity.related(rschema.type, role) except Unauthorized: return if 'filter' in dispctrl: @@ -303,7 +298,10 @@ def call(self, **kwargs): if 'dispctrl' in self.cw_extra_kwargs: - limit = self.cw_extra_kwargs['dispctrl'].get('limit') + if 'limit' in self.cw_extra_kwargs['dispctrl']: + limit = self.cw_extra_kwargs['dispctrl']['limit'] + else: + limit = self._cw.property_value('navigation.related-limit') list_limit = self.cw_extra_kwargs['dispctrl'].get('use_list_limit', 5) subvid = self.cw_extra_kwargs['dispctrl'].get('subvid', 'incontext') else: