This is an automated email from the ASF dual-hosted git repository. brondsem pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/allura.git
commit 3cf7c6ec731b0fc15553a7c9447c9e8dd3851bb7 Author: Guillermo Cruz <[email protected]> AuthorDate: Thu Jun 9 12:35:09 2022 -0600 [#8437] nofollow on empty main/single topic discussion pages --- ForgeDiscussion/forgediscussion/controllers/root.py | 4 +++- .../forgediscussion/templates/discussionforums/index.html | 2 +- ForgeDiscussion/forgediscussion/templates/index.html | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ForgeDiscussion/forgediscussion/controllers/root.py b/ForgeDiscussion/forgediscussion/controllers/root.py index 5d620f072..d1a9ac9cb 100644 --- a/ForgeDiscussion/forgediscussion/controllers/root.py +++ b/ForgeDiscussion/forgediscussion/controllers/root.py @@ -87,9 +87,11 @@ class RootController(BaseController, DispatchIndex, FeedController): app_config_id=c.app.config._id, parent_id=None, deleted=False)).all() forums = [f for f in forums if h.has_access(f, 'read')()] + noindex = all([f.num_topics == 0 for f in forums]) return dict(forums=forums, announcements=announcements, - hide_forum=(not new_forum)) + hide_forum=(not new_forum), + noindex=noindex) @expose('jinja:forgediscussion:templates/discussionforums/index.html') def new_forum(self, **kw): diff --git a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html index d5ee47eb8..1db6d49f4 100644 --- a/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html +++ b/ForgeDiscussion/forgediscussion/templates/discussionforums/index.html @@ -22,7 +22,7 @@ {% block title %}{{c.project.name}} / {{c.app.config.options.mount_label}}{% endblock %} {% block head %} - {% if not forums|length %} + {% if noindex %} <meta name="robots" content="noindex, follow"> {% endif %} {% endblock %} diff --git a/ForgeDiscussion/forgediscussion/templates/index.html b/ForgeDiscussion/forgediscussion/templates/index.html index b43fedccd..57af42022 100644 --- a/ForgeDiscussion/forgediscussion/templates/index.html +++ b/ForgeDiscussion/forgediscussion/templates/index.html @@ -18,6 +18,12 @@ -#} {% extends 'allura:templates/discussion/index.html' %} +{% block head %} + {{ super() }} + {% if not threads|length %} + <meta name="robots" content="noindex, follow"> + {% endif %} +{% endblock %} {% block actions %} {{ super() }}
