You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2017/01/27 15:50:59 UTC
[2/2] allura git commit: [#7232] Fixes moderation queue linking to
post replies
[#7232] Fixes moderation queue linking to post replies
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/0d169afc
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/0d169afc
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/0d169afc
Branch: refs/heads/master
Commit: 0d169afcff24894a1986334c220d46ddbc346a5d
Parents: d6ed1a9
Author: Kenton Taylor <kt...@slashdotmedia.com>
Authored: Wed Jan 18 19:13:51 2017 +0000
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Fri Jan 27 10:46:45 2017 -0500
----------------------------------------------------------------------
Allura/allura/templates/widgets/moderate_posts.html | 2 +-
Allura/allura/templates/widgets/post_thread.html | 2 +-
ForgeWiki/forgewiki/templates/wiki/page_view.html | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/0d169afc/Allura/allura/templates/widgets/moderate_posts.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/moderate_posts.html b/Allura/allura/templates/widgets/moderate_posts.html
index 6b55a25..0d40d44 100644
--- a/Allura/allura/templates/widgets/moderate_posts.html
+++ b/Allura/allura/templates/widgets/moderate_posts.html
@@ -55,7 +55,7 @@
<td>
{% if c.app.config.tool_name.lower() != 'discussion' %}
{% if post and post.thread and post.thread.artifact %}
- <a href="{{post.thread.artifact.url()}}">[{{post.thread.artifact.shorthand_id()}}]</a>
+ <a href="{{post.thread.artifact.url()}}#{{ post.slug }}">[{{post.thread.artifact.shorthand_id()}}]</a>
{% else %}
<!-- debug: missing pointers
{% if post %} post._id: {{ post._id }} {% endif %}
http://git-wip-us.apache.org/repos/asf/allura/blob/0d169afc/Allura/allura/templates/widgets/post_thread.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_thread.html b/Allura/allura/templates/widgets/post_thread.html
index 5930122..f74c237 100644
--- a/Allura/allura/templates/widgets/post_thread.html
+++ b/Allura/allura/templates/widgets/post_thread.html
@@ -24,7 +24,7 @@
<!-- post_thread replies -->
<ul>
{%- if children %}
- {%- for child in children if child.post.status == 'ok' %}
+ {%- for child in children if h.has_access(value, 'read') or child.post.status == 'ok' %}
{{widget.display(value=child.post, children=child.children, indent=indent+1)}}
{%- endfor %}
{%- endif %}
http://git-wip-us.apache.org/repos/asf/allura/blob/0d169afc/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index f770ccc..1b42dc2 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -108,7 +108,7 @@
<hr style="margin-top: 1em; margin-bottom: 2em; clear:both;">
{{lib.related_artifacts(page)}}
{% if page.discussion_thread and c.app.show_discussion %}
- {% if h.has_access(page, 'edit')() or page.discussion_thread.num_replies > 0 %}
+ {% if h.has_access(page, 'post')() or page.discussion_thread.num_replies > 0 %}
<div id="discussion_holder"><h2>Discussion</h2>
{% set thread = page.discussion_thread %}
<div>{{ c.thread.display(value=thread,page=pagenum,limit=limit,count=count) }}</div>