From 60756678abdbfbcd12fafc2c9a06ac2aa39d8650 Mon Sep 17 00:00:00 2001 From: Laureline Guerin Date: Tue, 15 Feb 2011 13:41:55 +0100 Subject: [PATCH] Pagination - simplification --- pelican/generators.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pelican/generators.py b/pelican/generators.py index 5029e397..a2da66a4 100755 --- a/pelican/generators.py +++ b/pelican/generators.py @@ -17,7 +17,7 @@ from pelican.paginator import Paginator _TEMPLATES = ('index', 'tag', 'tags', 'article', 'category', 'categories', 'archives', 'page') _DIRECT_TEMPLATES = ('index', 'tags', 'categories', 'archives') -_PAGINATED_DIRECT_TEMPLATES = ('index', 'tag', 'category') +_PAGINATED_DIRECT_TEMPLATES = ('index', ) class Generator(object): @@ -162,7 +162,7 @@ class ArticlesGenerator(Generator): # and subfolders after that for tag, articles in self.tags.items(): - if self.settings.get('WITH_PAGINATION') and 'tag' in _PAGINATED_DIRECT_TEMPLATES: + if self.settings.get('WITH_PAGINATION'): articles_paginator = Paginator(articles, self.settings.get('DEFAULT_PAGINATION'), self.settings.get('DEFAULT_ORPHANS')) @@ -176,7 +176,7 @@ class ArticlesGenerator(Generator): tag=tag, articles=articles) for cat, articles in self.categories: - if self.settings.get('WITH_PAGINATION') and 'tag' in _PAGINATED_DIRECT_TEMPLATES: + if self.settings.get('WITH_PAGINATION'): articles_paginator = Paginator(articles, self.settings.get('DEFAULT_PAGINATION'), self.settings.get('DEFAULT_ORPHANS'))