Index: browser.py =================================================================== RCS file: /home/cvs/cvsroot/plone/Products/rfasite/browser.py,v retrieving revision 1.55 retrieving revision 1.55.2.2 diff -u -r1.55 -r1.55.2.2 --- browser.py 10 Sep 2007 15:27:22 -0000 1.55 +++ browser.py 22 Jan 2008 22:30:19 -0000 1.55.2.2 @@ -1,6 +1,6 @@ """ RFA browser views -$Id: browser.py,v 1.55 2007/09/10 15:27:22 tseaver Exp $ +$Id: browser.py,v 1.55.2.2 2008/01/22 22:30:19 tseaver Exp $ """ import calendar import urlparse @@ -110,16 +110,22 @@ navroot = self.navroot() navroot_path = '/'.join(navroot.getPhysicalPath()) - pathquery = {'query': navroot_path} # add {'depth':x} here to limit - query = { - 'path':pathquery, 'portal_type':['Section'], - 'sort_on':'nav_sort_spec', 'sort_order':'asc' - } + pathquery = {'query': navroot_path, + 'depth': 2, + } + query = {'path': pathquery, + 'portal_type': ['Section'], + 'sort_on': 'nav_sort_spec', + 'sort_order': 'asc' + } context = utils.context(self) c_path = '/'.join(context.getPhysicalPath()) ctool = getToolByName(context, 'portal_catalog') - brains = ctool.searchResults(query) + brains = ctool.search(query_request=query, + sort_index='nav_sort_spec', + reverse=0, + ) parents = {} root = {'children':[]} for brain in brains: @@ -287,9 +293,9 @@ if section is not None: for story in section.listFeaturedStories(use_catalog=True): - s_allowed = IAllowed(story) - if not s_allowed: - continue + #s_allowed = IAllowed(story) + #if not s_allowed: + # continue story_url = story.absolute_url() if story_url == self._top_url: continue Index: section.py =================================================================== RCS file: /home/cvs/cvsroot/plone/Products/rfasite/section.py,v retrieving revision 1.32 retrieving revision 1.32.2.1 diff -u -r1.32 -r1.32.2.1 --- section.py 7 Sep 2007 20:58:22 -0000 1.32 +++ section.py 22 Jan 2008 22:30:19 -0000 1.32.2.1 @@ -1,6 +1,6 @@ """ RFA Section Module -$Id: section.py,v 1.32 2007/09/07 20:58:22 tseaver Exp $ +$Id: section.py,v 1.32.2.1 2008/01/22 22:30:19 tseaver Exp $ """ from AccessControl import ClassSecurityInfo from Globals import InitializeClass @@ -233,12 +233,22 @@ spec = '/'.join(path), self.nav_index return spec - def listFeaturedStories(self, with_audio_only=False, use_catalog=False): + def listFeaturedStories(self, + with_audio_only=False, + use_catalog=False, + limit=None, + ): """ See ISection. """ max = self.getMaxStories() + if limit is not None: + max = min(max, int(limit)) + if use_catalog: where = '/'.join(self.getPhysicalPath()) + path_query = {'query': where, + #'depth': 1, # XXX can't? + } catalog = getToolByName(self, 'portal_catalog') brains = catalog.search(query_request={'path': where, 'portal_type': 'Story', @@ -246,7 +256,7 @@ }, sort_index='effective', reverse=True, - limit=max * 2, # allow for some headroom + limit=min(max * 2, 20), ) stories = [x.getObject() for x in brains] else: @@ -257,7 +267,7 @@ if with_audio_only: return _only_audio(stories, max) - # XXX: let view do the filtering? + # XXX: let view do the filtering? Not for now. checker = _AllowedOrNoneChecker() return [x for x in stories if checker(x)][:max] Index: skins/rfa/global_contentmenu.pt =================================================================== RCS file: /home/cvs/cvsroot/plone/Products/rfasite/skins/rfa/global_contentmenu.pt,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- skins/rfa/global_contentmenu.pt 15 Nov 2006 18:00:17 -0000 1.3 +++ skins/rfa/global_contentmenu.pt 22 Jan 2008 00:41:33 -0000 1.3.2.1 @@ -8,7 +8,9 @@