IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove comment rejection; delete is fine for that now.

Browse Source
This commit is contained in:
Georg Brandl
2010-11-21 20:47:32 +01:00
parent 6d6f799710
commit f9705fc5b7
3 changed files with 2 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sphinx/themes/basic/static/websupport.js
View File

@@ -90,10 +90,6 @@
acceptComment($(this).attr('id').substring(2));
return false;
});
$('a.reject-comment').live("click", function() {
rejectComment($(this).attr('id').substring(2));
return false;
});
$('a.delete-comment').live("click", function() {
deleteComment($(this).attr('id').substring(2));
return false;
@@ -334,23 +330,6 @@
});
}
function rejectComment(id) {
$.ajax({
type: 'POST',
url: opts.rejectCommentURL,
data: {id: id},
success: function(data, textStatus, request) {
var div = $('#cd' + id);
div.slideUp('fast', function() {
div.remove();
});
},
error: function(request, textStatus, error) {
showError('Oops, there was a problem rejecting the comment.');
}
});
}
function deleteComment(id) {
$.ajax({
type: 'POST',
@@ -568,7 +547,7 @@
/** Create a div to display a comment in. */
function createCommentDiv(comment) {
if (!comment.displayed) {
if (!comment.displayed && !opts.moderator) {
return $('<div>Thank you! Your comment will show up once it is has '
+ ' been approved by a moderator.</div>');
}
@@ -579,7 +558,7 @@
var context = $.extend({}, opts, comment);
var div = $(renderTemplate(commentTemplate, context));
// If the user has voted on this comment, highlight the correct arrow.
// If the user has voted on this comment, highblight the correct arrow.
if (comment.vote) {
var direction = (comment.vote == 1) ? 'u' : 'd';
div.find('#' + direction + 'v' + comment.id).hide();
@@ -679,7 +658,6 @@
addCommentURL: '/_add_comment',
getCommentsURL: '/_get_comments',
acceptCommentURL: '/_accept_comment',
rejectCommentURL: '/_reject_comment',
deleteCommentURL: '/_delete_comment',
commentImage: '/static/_static/comment.png',
closeCommentImage: '/static/_static/comment-close.png',
@@ -770,7 +748,6 @@
<a href="#" id="dc<%id%>" class="delete-comment hidden">delete</a>\
<span id="cm<%id%>" class="moderation hidden">\
<a href="#" id="ac<%id%>" class="accept-comment">accept</a>\
<a href="#" id="rc<%id%>" class="reject-comment">reject</a>\
</span>\
</p>\
<pre class="proposal" id="pr<%id%>">\

13
sphinx/websupport/__init__.py
View File

@@ -383,19 +383,6 @@ class WebSupport(object):
raise errors.UserNotAuthorizedError()
self.storage.accept_comment(comment_id)
def reject_comment(self, comment_id, moderator=False):
"""Reject a comment that is pending moderation.
This raises :class:`~sphinx.websupport.errors.UserNotAuthorizedError`
if moderator is False.
:param comment_id: The id of the comment that was accepted.
:param moderator: Whether the user making the request is a moderator.
"""
if not moderator:
raise errors.UserNotAuthorizedError()
self.storage.reject_comment(comment_id)
def _make_base_comment_options(self):
"""Helper method to create the part of the COMMENT_OPTIONS javascript
that remains the same throughout the lifetime of the

8
sphinx/websupport/storage/sqlalchemystorage.py
View File

@@ -172,11 +172,3 @@ class SQLAlchemyStorage(StorageBackend):
session.commit()
session.close()
def reject_comment(self, comment_id):
session = Session()
comment = session.query(Comment).filter(Comment.id == comment_id).one()
session.delete(comment)
session.commit()
session.close()