You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by gc...@apache.org on 2022/06/10 19:52:17 UTC
[allura] branch gc/8437 updated: [#8437] nofollow on empty main/single topic discussion pages
This is an automated email from the ASF dual-hosted git repository.
gcruz pushed a commit to branch gc/8437
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/gc/8437 by this push:
new 599cf00a1 [#8437] nofollow on empty main/single topic discussion pages
599cf00a1 is described below
commit 599cf00a1632da7fdd483dd1f2935bf9493c9b86
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Fri Jun 10 13:51:46 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 dedbbf45a..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 forums|length and forums[0].num_topics == 0 %}
+ {% 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() }}