MoinMoin: MacroMarket/CollectLists/moin19.patch

   1 --- CollectLists.old.py 2010-01-12 17:29:54 +0300
   2 +++ CollectLists.py     2010-01-12 18:22:55 +0300
   3 @@ -26,7 +26,6 @@
   4  from MoinMoin import wikiutil
   5  from MoinMoin.Page import Page
   6  from MoinMoin.util.dataset import TupleDataset, Column
   7 -from MoinMoin.wikidicts import Dict
   8  from MoinMoin.widget.browser import DataBrowserWidget
   9  
  10  Dependencies = ["pages"]
  11 @@ -62,11 +61,15 @@
  12          # Don't filter if syntax was wrong
  13          filter_column_value = u''
  14  
  15 +    page = Page(request, pagename)
  16 +    if not page.exists:
  17 +        return _("Page '%(new_pagename)s' does not exist or you don't have enough rights.") % {"new_pagename": pagename}
  18 +
  19      needle = '^%s/(.*)' % pagename
  20      filterfn = re.compile(needle).search
  21      pages = request.rootpage.getPageList(exists=1, filter=filterfn)
  22      if not pages:
  23 -        return _("Page '%(new_pagename)s' does not exist or you don't have enough rights.") % {"new_pagename": pagename}
  24 +        return ''
  25  
  26      # ignore Template pages
  27      filterfn = request.cfg.cache.page_template_regexact.search
  28 @@ -82,12 +85,12 @@
  29      # use keys from template page
  30      elif Page(request, template).exists():
  31          page = Page(request, template)
  32 -        page_dict = Dict(request, template)
  33 +        page_dict = request.dicts[template]
  34          column_heading_keys = page_dict.keys()
  35      else:
  36          # fallback use the keys of the first subpage
  37          page = Page(request, subpages[0])
  38 -        page_dict = Dict(request, subpages[0])
  39 +        page_dict = reqest.dicts[subpages[0]]
  40          column_heading_keys = page_dict.keys()
  41  
  42      data = TupleDataset()
  43 @@ -99,7 +102,7 @@
  44  
  45      for name in subpages:
  46          page = Page(request, name)
  47 -        page_dict = Dict(request, name)
  48 +        page_dict = request.dicts[name]
  49          if filter_column_value and page_dict.get(filter_key, '') != filter_word:
  50              continue
  51          row = []