github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/malept/davidmarble-page-order-by' into davidmarble-page-order-by

Browse source 
Conflicts:
	docs/settings.rst
	pelican/generators.py
	pelican/tests/test_generators.py
This commit is contained in:
Vincent Jousse 2014-05-14 10:48:41 +02:00
commit ebf0da0f7b
6 changed files with 94 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pelican/generators.py
View file

@ -501,7 +501,8 @@ class ArticlesGenerator(CachingGenerator):
(repr(article.status),
repr(f)))
self.articles, self.translations = process_translations(all_articles)
self.articles, self.translations = process_translations(all_articles,
order_by=self.settings['ARTICLE_ORDER_BY'])
self.drafts, self.drafts_translations = \
process_translations(all_drafts)
@ -618,7 +619,8 @@ class PagesGenerator(CachingGenerator):
(repr(page.status),
repr(f)))
self.pages, self.translations = process_translations(all_pages)
self.pages, self.translations = process_translations(all_pages,
order_by=self.settings['PAGE_ORDER_BY'])
self.hidden_pages, self.hidden_translations = (
process_translations(hidden_pages))