From: Benoît Pin Date: Mon, 1 Jul 2013 12:24:32 +0000 (+0200) Subject: Merge branch 'zope-2.13' of ssh://ssh.cri.ensmp.fr/~pin/gitrepositories/Portfolio... X-Git-Url: https://scm.cri.mines-paristech.fr/git/Portfolio.git/commitdiff_plain/da5eed398d4e0b1945dc81d5a2d741db12ab84d9?hp=5802a9ba7af569abfc58b5e8c554ceacecf348ce Merge branch 'zope-2.13' of ssh://ssh.cri.ensmp.fr/~pin/gitrepositories/Portfolio into zope-2.13 --- diff --git a/skins/imagelist.xml.py b/skins/imagelist.xml.py index 12b0392..74818fd 100755 --- a/skins/imagelist.xml.py +++ b/skins/imagelist.xml.py @@ -21,10 +21,10 @@ req.other['disable_cookie_login__'] = 1 options = {} -options['channel_info'] = { 'base': stool.getHTML4UpdateBase(context), +options['channel_info'] = { 'base': stool.getHTML4UpdateBase(None), 'description': context.Description(), - 'frequency': stool.getUpdateFrequency(context), - 'period': stool.getUpdatePeriod(context), + 'frequency': stool.getUpdateFrequency(None), + 'period': stool.getUpdatePeriod(None), 'title': context.title_or_id(), 'url': context.absolute_url(), 'author': mtool.getMemberFullNameById(context.Creator(), nameBefore=0), @@ -35,7 +35,7 @@ key, reverse = context.getDefaultSorting() items = stool.getSyndicatableContent(context) items = sequence.sort( items, ((key, 'cmp', reverse and 'desc' or 'asc'),) ) items = LazyFilter(items, skip='View') -b_size = stool.getMaxItems(context) +b_size = stool.getMaxItems(None) if all is False: batch_obj = Batch(items, b_size, 0, orphan=0) elif all is True :