You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/12/24 15:33:58 UTC
[5/7] allura git commit: [#8020] ticket:875 added test for undo;
added text when spam clicking occured at ticket post page
[#8020] ticket:875 added test for undo; added text when spam clicking occured at ticket post page
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7a582ace
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7a582ace
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7a582ace
Branch: refs/heads/ib/8020a
Commit: 7a582ace782ab2ed3c7464cd4ff638e6917e3b29
Parents: d47f465
Author: DeV1doR <de...@ukr.net>
Authored: Fri Dec 11 13:56:05 2015 +0200
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Dec 23 12:48:00 2015 +0200
----------------------------------------------------------------------
Allura/allura/controllers/discuss.py | 2 ++
Allura/allura/lib/widgets/discuss.py | 15 ++++++++++++++-
Allura/allura/nf/allura/css/site_style.css | 6 ++++++
Allura/allura/templates/widgets/post_widget.html | 12 +++++++++++-
Allura/allura/tests/functional/test_discuss.py | 8 ++++++++
5 files changed, 41 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7a582ace/Allura/allura/controllers/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index 818cc10..add5ef3 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -355,6 +355,8 @@ class PostController(BaseController):
self.post.delete()
elif kw.pop('spam', None):
self.post.spam()
+ elif kw.pop('undo', None):
+ self.post.status = 'pending'
elif kw.pop('approve', None):
if self.post.status != 'ok':
self.post.approve()
http://git-wip-us.apache.org/repos/asf/allura/blob/7a582ace/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 94310e2..5badc98 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -341,12 +341,25 @@ class Post(HierWidget):
$('div.moderate', post).removeClass('moderate');
}
else if (mod == 'Spam'){
- $(post).remove();
+ spam_block_display($(post), 'none');
+ $(post).find('.spam-present').show();
+ }
+ else if (mod == 'Undo'){
+ spam_block_display($(post), 'block');
+ $(post).find('.spam-present').hide();
}
}
});
});
+ function spam_block_display($post, display_type) {
+ $post.find('.display_post').css(
+ 'display', display_type);
+ $.each($post.find('.options').children(), function() {
+ $(this).css('display', display_type);
+ });
+ }
+
function get_cm($elem) { return $('.CodeMirror', $elem)[0].CodeMirror; }
if($('a.edit_post', post)){
http://git-wip-us.apache.org/repos/asf/allura/blob/7a582ace/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 7367432..76606af 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -3422,3 +3422,9 @@ fieldset.preferences legend {
.ui-autocomplete {
z-index: 10; /* so autocomplete of tags or username is always over markdown editor components */
}
+.spam-present {
+ display: none;
+}
+.spam-text {
+ float: left;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/allura/blob/7a582ace/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 88fa1d1..4912757 100644
--- a/Allura/allura/templates/widgets/post_widget.html
+++ b/Allura/allura/templates/widgets/post_widget.html
@@ -43,7 +43,17 @@
</div>
{% set pending = value.status == 'pending' %}
{% set moderator = h.has_access(value, 'moderator')() %}
- <div class="grid-14" style="width: {{indent == 0 and 525 or (indent <= 40 and 515-indent*10 or 65)}}px">
+ <div class="grid-14 post-content" style="width: {{indent == 0 and 525 or (indent <= 40 and 515-indent*10 or 65)}}px">
+ <div class="spam-present">
+ <span class="spam-text">Comment has been marked as spam. </span>
+ <form method="POST" action="{{value.url()+'moderate'}}">
+ <input type="hidden" name="undo" value="True"/>
+ <a href="" class="moderate_post little_link"><span>Undo</span></a>
+ {{lib.csrf_token()}}
+ </form>
+ <br>
+ <span class="spam-text">You can see all comments posted by this user </span><a href="/p/test/tickets/_discuss/moderate">here</a>
+ </div>
<div class="display_post{% if pending and moderator %} moderate{% endif %}">
{% if pending and not moderator %}
<b>Post awaiting moderation.</b>
http://git-wip-us.apache.org/repos/asf/allura/blob/7a582ace/Allura/allura/tests/functional/test_discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_discuss.py b/Allura/allura/tests/functional/test_discuss.py
index d70664b..47218c8 100644
--- a/Allura/allura/tests/functional/test_discuss.py
+++ b/Allura/allura/tests/functional/test_discuss.py
@@ -208,6 +208,14 @@ class TestDiscuss(TestDiscussBase):
))
assert r_bad_filtered.html.tbody.findAll('tr') == []
+ def test_undo(self):
+ r = self._make_post('Test post')
+ post_link = str(
+ r.html.find('div', {'class': 'edit_post_form reply'}).find('form')['action'])
+ self.app.post(post_link + 'moderate', params=dict(undo='undo'))
+ post = M.Post.query.find().first()
+ assert post.status == 'pending'
+
@patch.object(M.Thread, 'is_spam')
def test_feed_does_not_include_comments_held_for_moderation(self, is_spam):
is_spam.return_value = True