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

Fix for issue #219: tags should list only main articles, not translations

Browse source
This commit is contained in:
Deniz Turgut 2013-03-26 01:28:42 -04:00
commit e6f3126ba6
7 changed files with 32 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pelican/generators.py
View file

@ -417,9 +417,6 @@ class ArticlesGenerator(Generator):
self.add_source_path(article) self.add_source_path(article)
if article.status == "published": if article.status == "published":
if hasattr(article, 'tags'):
for tag in article.tags:
self.tags[tag].append(article)
all_articles.append(article) all_articles.append(article)
elif article.status == "draft": elif article.status == "draft":
self.drafts.append(article) self.drafts.append(article)
@ -431,12 +428,17 @@ class ArticlesGenerator(Generator):
self.articles, self.translations = process_translations(all_articles) self.articles, self.translations = process_translations(all_articles)
for article in self.articles: for article in self.articles:
# only main articles are listed in categories, not translations # only main articles are listed in categories and tags
# not translations
self.categories[article.category].append(article) self.categories[article.category].append(article)
if hasattr(article, 'tags'):
for tag in article.tags:
self.tags[tag].append(article)
# ignore blank authors as well as undefined # ignore blank authors as well as undefined
if hasattr(article, 'author') and article.author.name != '': if hasattr(article, 'author') and article.author.name != '':
self.authors[article.author].append(article) self.authors[article.author].append(article)
# sort the articles by date # sort the articles by date
self.articles.sort(key=attrgetter('date'), reverse=True) self.articles.sort(key=attrgetter('date'), reverse=True)
self.dates = list(self.articles) self.dates = list(self.articles)

42
pelican/tests/output/basic/tag/bar.html
View file

@ -35,48 +35,24 @@
<aside id="featured" class="body"> <aside id="featured" class="body">
<article> <article>
<h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
<footer class="post-info"> <footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00"> <abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012 Wed 29 February 2012
</abbr> </abbr>
<p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article.html">en</a>
</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
</article>
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
title="Permalink to Second article">Second article</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012
</abbr>
<p>In <a href="../category/misc.html">misc</a>. </p> <p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article-fr.html">fr</a> <a href="../second-article-fr.html">fr</a>
</footer><!-- /.post-info --> <p>This is some article, in english</p> </footer><!-- /.post-info --><p>This is some article, in english</p>
</article>
<a class="readmore" href="../second-article.html">read more</a> </aside><!-- /#featured -->
</div><!-- /.entry-content --> <section id="content" class="body">
</article></li> <h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry"> <li><article class="hentry">

40
pelican/tests/output/basic/tag/baz.html
View file

@ -35,49 +35,21 @@
<aside id="featured" class="body"> <aside id="featured" class="body">
<article> <article>
<h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
<footer class="post-info"> <footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00"> <abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012 Wed 29 February 2012
</abbr> </abbr>
<p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article.html">en</a>
</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
</article>
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
title="Permalink to Second article">Second article</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012
</abbr>
<p>In <a href="../category/misc.html">misc</a>. </p> <p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article-fr.html">fr</a> <a href="../second-article-fr.html">fr</a>
</footer><!-- /.post-info --> <p>This is some article, in english</p> </footer><!-- /.post-info --><p>This is some article, in english</p>
</article>
<a class="readmore" href="../second-article.html">read more</a> </aside><!-- /#featured -->
</div><!-- /.entry-content --> </ol><!-- /#posts-list -->
</article></li> </section><!-- /#content -->
</ol><!-- /#posts-list -->
</section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social"> <div class="social">
<h2>social</h2> <h2>social</h2>

42
pelican/tests/output/basic/tag/foo.html
View file

@ -35,48 +35,24 @@
<aside id="featured" class="body"> <aside id="featured" class="body">
<article> <article>
<h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
<footer class="post-info"> <footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00"> <abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012 Wed 29 February 2012
</abbr> </abbr>
<p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article.html">en</a>
</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
</article>
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
title="Permalink to Second article">Second article</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012
</abbr>
<p>In <a href="../category/misc.html">misc</a>. </p> <p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article-fr.html">fr</a> <a href="../second-article-fr.html">fr</a>
</footer><!-- /.post-info --> <p>This is some article, in english</p> </footer><!-- /.post-info --><p>This is some article, in english</p>
</article>
<a class="readmore" href="../second-article.html">read more</a> </aside><!-- /#featured -->
</div><!-- /.entry-content --> <section id="content" class="body">
</article></li> <h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry"> <li><article class="hentry">

45
pelican/tests/output/custom/tag/bar.html
View file

@ -39,7 +39,7 @@
<aside id="featured" class="body"> <aside id="featured" class="body">
<article> <article>
<h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
<footer class="post-info"> <footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00"> <abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012 Wed 29 February 2012
@ -49,44 +49,17 @@
By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
</address> </address>
<p>In <a href="../category/misc.html">misc</a>. </p> <p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article.html">en</a>
</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p> </article>
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
title="Permalink to Second article">Second article</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012
</abbr>
<address class="vcard author">
By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
</address>
<p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article-fr.html">fr</a> <a href="../second-article-fr.html">fr</a>
</footer><!-- /.post-info --> <p>This is some article, in english</p> </footer><!-- /.post-info --><p>This is some article, in english</p>
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </article>
<a class="readmore" href="../second-article.html">read more</a> </aside><!-- /#featured -->
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content --> <section id="content" class="body">
</article></li> <h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry"> <li><article class="hentry">

43
pelican/tests/output/custom/tag/baz.html
View file

@ -39,7 +39,7 @@
<aside id="featured" class="body"> <aside id="featured" class="body">
<article> <article>
<h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
<footer class="post-info"> <footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00"> <abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012 Wed 29 February 2012
@ -49,47 +49,16 @@
By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
</address> </address>
<p>In <a href="../category/misc.html">misc</a>. </p> <p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article.html">en</a>
</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p> </article>
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
title="Permalink to Second article">Second article</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012
</abbr>
<address class="vcard author">
By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
</address>
<p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article-fr.html">fr</a> <a href="../second-article-fr.html">fr</a>
</footer><!-- /.post-info --> <p>This is some article, in english</p> </footer><!-- /.post-info --><p>This is some article, in english</p>
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </article>
<a class="readmore" href="../second-article.html">read more</a> <p class="paginator">
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content -->
</article></li>
</ol><!-- /#posts-list -->
<p class="paginator">
Page 1 / 1 Page 1 / 1
</p> </p>
</aside><!-- /#featured -->
</ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="blogroll"> <div class="blogroll">

45
pelican/tests/output/custom/tag/foo.html
View file

@ -39,7 +39,7 @@
<aside id="featured" class="body"> <aside id="featured" class="body">
<article> <article>
<h1 class="entry-title"><a href="../second-article-fr.html">Deuxième article</a></h1> <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
<footer class="post-info"> <footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00"> <abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012 Wed 29 February 2012
@ -49,44 +49,17 @@
By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a> By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
</address> </address>
<p>In <a href="../category/misc.html">misc</a>. </p> <p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article.html">en</a>
</footer><!-- /.post-info --><p>Ceci est un article, en français.</p>
<p>There are <a href="../second-article-fr.html#disqus_thread">comments</a>.</p> </article>
</aside><!-- /#featured -->
<section id="content" class="body">
<h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry">
<header>
<h1><a href="../second-article.html" rel="bookmark"
title="Permalink to Second article">Second article</a></h1>
</header>
<div class="entry-content">
<footer class="post-info">
<abbr class="published" title="2012-02-29T00:00:00">
Wed 29 February 2012
</abbr>
<address class="vcard author">
By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
</address>
<p>In <a href="../category/misc.html">misc</a>. </p>
<p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations:
<a href="../second-article-fr.html">fr</a> <a href="../second-article-fr.html">fr</a>
</footer><!-- /.post-info --> <p>This is some article, in english</p> </footer><!-- /.post-info --><p>This is some article, in english</p>
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </article>
<a class="readmore" href="../second-article.html">read more</a> </aside><!-- /#featured -->
<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p> </div><!-- /.entry-content --> <section id="content" class="body">
</article></li> <h1>Other articles</h1>
<hr />
<ol id="posts-list" class="hfeed">
<li><article class="hentry"> <li><article class="hentry">