You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/02/11 20:53:06 UTC
[1/4] git commit: [#284] Allow moderators to edit unmoderated posts
before approving them
[#284] Allow moderators to edit unmoderated posts before approving them
Signed-off-by: Cory Johns <jo...@geek.net>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/73a74278
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/73a74278
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/73a74278
Branch: refs/heads/master
Commit: 73a74278fdd874ff2756bc3f7aca3e241818f268
Parents: c3f1ed4
Author: Cory Johns <jo...@geek.net>
Authored: Mon Feb 11 19:51:29 2013 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Mon Feb 11 19:52:19 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/widgets/discuss.py | 5 +----
Allura/allura/templates/widgets/post_widget.html | 4 ++--
.../forgediscussion/tests/functional/test_forum.py | 2 +-
3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/73a74278/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 0c6774b..3c28d09 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -282,11 +282,8 @@ class Post(HierWidget):
$(post).remove();
}
else if (mod == 'Approve'){
- $('a.reply_post', post).show();
- $('div.little_link', post).show();
+ $('a.reply_post, a.shortlink, form.moderate_spam, form.moderate_approve', post).toggle();
$('div.moderate', post).removeClass('moderate');
- $('form.moderate_spam', post).hide();
- $('form.moderate_approve', post).hide();
}
else if (mod == 'Spam'){
$(post).remove();
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/73a74278/Allura/allura/templates/widgets/post_widget.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/post_widget.html b/Allura/allura/templates/widgets/post_widget.html
index a53f516..973626d 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -79,8 +79,8 @@
<a href="" class="reply_post btn"{%if value.status == 'pending'%} style="display:none"{%endif%}><b data-icon="{{g.icons['reply'].char}}" class="ico {{g.icons['reply'].css}}"></b>Reply</a>
{% endif %}
<div style="clear:both">
- <div class="little_link"{%if value.status == 'pending'%} style="display:none"{%endif%}>
- <a href="{{shortlink_url}}" class="little_link shortlink"><span>Link</span></a><br/>
+ <div class="little_link">
+ <a href="{{shortlink_url}}" class="little_link shortlink"{%if value.status == 'pending'%} style="display:none"{%endif%}><span>Link</span></a><br/>
{% if h.has_access(value, 'moderate')()%}
<a href="" class="edit_post little_link"><span>Edit</span></a><br/>
{% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/73a74278/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index e10f506..ab1d34b 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -431,7 +431,7 @@ class TestForum(TestController):
r = self.app.get(thread.request.url)
assert '<div class="display_post moderate">' in r
assert '<a href="" class="reply_post btn" style="display:none">' in r
- assert '<div class="little_link" style="display:none">' in r
+ assert r.html.find('a',{'class': 'little_link shortlink', 'style': 'display:none'}) is not None
assert 'name="delete"' in r
assert 'name="approve"' in r
assert 'name="spam"' in r