static/images/warn_icon.gif @@ -85,10 +85,8 @@ class RadarViewByIdAction(Handler): if (not radar): self.respondWithText('Invalid Radar id') return - - comments = Comment.gql("WHERE radar = :1", radar) - self.respondWithTemplate('radar-view.html', {"radar":radar, "comments": comments}) + self.respondWithTemplate('radar-view.html', {"radar":radar, "comments": radar.comments()}) class RadarViewByNumberAction(Handler): def get(self): @@ -102,9 +100,7 @@ class RadarViewByNumberAction(Handler): self.respondWithText('Invalid Radar id') return - comments = Comment.gql("WHERE radar = :1 AND is_reply_to = :2", radar, None) - - self.respondWithTemplate('radar-view.html', {"radar":radar, "comments": comments}) + self.respondWithTemplate('radar-view.html', {"radar":radar, "comments": radar.comments()}) class RadarEditAction(Handler): def get(self): @@ -258,7 +254,7 @@ class APISecretAction(Handler): self.respondWithDictionaryAsJSON({"name":name, "value":value}) -class CommentsAJAXForm(Handler): +class CommentsAJAXFormAction(Handler): def _check(self): user = users.GetCurrentUser() if (not user): @@ -289,7 +285,7 @@ class CommentsAJAXForm(Handler): args = {"radar": radar} if(replyTo): - args["is_reply_to"] = post + args["is_reply_to"] = replyTo self.respondWithText(Comment(**args).form()) @@ -316,7 +312,31 @@ class CommentsAJAXForm(Handler): self.respondWithText(comment.draw()) - +class CommentsAJAXRemoveAction(Handler): + def post(self): + user = users.GetCurrentUser() + if (not user): + self.error(401) + self.respondWithText("You must login to remove a comment") + return + + commentKey = self.request.get("key") + comment = Comment.get(commentKey) + if(not comment): + self.error(400) + self.respondWithText("Tried to remove a post that doesn't exist? Couldn't find post to remove.") + return + + if(not comment.editable_by_current_user()): + self.error(401) + self.respondWithText("You must be the comment's owner, or an admin, to remove this comment.") + return + + if(comment.deleteOrBlank() == "blanked"): + self.respondWithText(comment.html_body()) + else: + self.respondWithText("REMOVED") + def main(): application = webapp.WSGIApplication([ @@ -332,7 +352,8 @@ def main(): ('/api/test', APITestAction), ('/api/radars', APIRadarsAction), ('/api/radars/add', APIAddRadarAction), - ('/comment', CommentsAJAXForm), + ('/comment', CommentsAJAXFormAction), + ('/comment/remove', CommentsAJAXRemoveAction), # intentially disabled # ('/api/secret', APISecretAction), ('.*', NotFoundAction) main.py @@ -32,6 +32,9 @@ class Radar(db.Model): def put(self): self.modified = datetime.datetime.now() db.Model.put(self) + + def comments(self): + return Comment.gql("WHERE radar = :1 AND is_reply_to = :2", self, None) import markdown md = markdown.Markdown() @@ -46,7 +49,7 @@ class Comment(db.Model): def __init__(self, *args, **kwargs): super(Comment, self).__init__(*args, **kwargs) - self.posted_at = datetime.datetime.now() + if(not self.posted_at): self.posted_at = datetime.datetime.now() if(not self.body): self.body = "" if(not self.subject): self.subject = "" @@ -74,3 +77,18 @@ class Comment(db.Model): def html_body(self): return md.convert(self.body) + def editable_by_current_user(self): + from google.appengine.api import users + user = users.GetCurrentUser() + return user == self.user or users.is_current_user_admin() + + def deleteOrBlank(self): + if self.replies().count() > 0: + self.subject = "(Removed)" + self.body = "*This comment has been removed by its author or a moderator.*" + self.put() + return "blanked" + else: + self.delete() + return "deleted" + \ No newline at end of file models.py @@ -256,7 +256,7 @@ div.indent { color: #66b; } -.comment input, +.comment h3 input, .comment textarea { width: 100%; } static/css/screen.css @@ -52,4 +52,54 @@ function submitComment(form) { } }) +} + +function replyForm(somethingInsideTheComment) { + var comment = jQuery(somethingInsideTheComment).parents(".comment") + var parent_key = comment.children(".keyref")[0].name + + jQuery.ajax({ + url: "/comment", + type: "get", + data: { + radar: jQuery("#radar").text(), + is_reply_to: parent_key + }, + success: function(commentForm) { + comment.parent(".commentWithReplies").children(".indent").append(commentForm).children(":last").hide().slideDown() + }, + error: function(xhr, textStatus, errorThrown) { + showError(xhr.responseText) + } + }) +} + +function removeComment(somethingInsideTheComment) { + if(!confirm("Are you sure you want to remove this comment? You can't undo this.")) + return + + var comment = jQuery(somethingInsideTheComment).parents(".comment") + var remove_key = comment.children(".keyref")[0].name + jQuery.ajax({ + url: "/comment/remove", + type: "post", + data: { + radar: jQuery("#radar").text(), + key: remove_key + }, + success: function(removalText) { + if(removalText.indexOf("REMOVED")==0) { + comment.parent(".commentWithReplies").slideUp(function() { + comment.parent(".commentWithReplies").remove() + }) + }else { + comment.children("h3").text("(Removed)") + comment.children(".commentbody").html(removalText) + } + }, + error: function(xhr, textStatus, errorThrown) { + showError(xhr.responseText) + } + }) + } \ No newline at end of file static/js/comments.js @@ -10,7 +10,13 @@ <textarea name="body" rows="10">{{ comment.body }}</textarea> </div> <div class="meta"> - <input type="submit" value="Post message"/> + {% if comment.is_saved %} + <input type="button" value="Cancel" /> + <input type="submit" value="Edit" /> + {% else %} + <input type="button" value="Cancel" /> + <input type="submit" value="Post message" /> + {% endif %} </div> </div> </form> \ No newline at end of file templates/comment-form.html @@ -1,16 +1,24 @@ -<div class="comment"> - <a name="{{comment.key}}"></a> - <h3>{{ comment.subject }}</h3> - <div class="commentbody"> - {{ comment.html_body }} +<div class="commentWithReplies"> + <div class="comment"> + <a class="keyref" name="{{comment.key}}"></a> + <h3>{{ comment.subject }}</h3> + <div class="commentbody"> + {{ comment.html_body }} + </div> + <div class="meta"> + By <a href="mailto:{{comment.user.email}}">{{ comment.user }}</a> at + <a href="#{{comment.key}}">{{ comment.posted_at }}</a> + (<a href="#" onclick="javascript:replyForm(this); return false">reply...</a>) + {% if comment.editable_by_current_user %} + <input type="button" name="edit" value="Edit" /> + <input type="button" name="remove" value="Remove" onclick="javascript:removeComment(this); return false;"/> + {% endif %} + </div> </div> - <div class="meta"> - By <a href="mailto:{{comment.user.email}}">{{ comment.user }}</a> at <a href="#{{comment.key}}">{{ comment.posted_at }}</a> (<a href="#">reply...</a>) - </div> -</div> -<div class="indent"> - {% for reply in comment.replies %} - {{ reply.draw }} - {% endfor %} + <div class="indent"> + {% for reply in comment.replies %} + {{ reply.draw }} + {% endfor %} + </div> </div> \ No newline at end of file templates/comment.html 2a7f377134d4041b7553fe47b123292b2dd616bb Joachim Bengtsson joachimb@gmail.com http://github.com/timburks/openradar/commit/85b74cd28dfa6e4bcf6e58c0c6268bc4b0acd6ec 85b74cd28dfa6e4bcf6e58c0c6268bc4b0acd6ec 2008-11-21T00:51:54-08:00 2008-11-21T00:51:54-08:00 Removal works fine 8ede0587653fef188614b6349ddd0edb901a71b3 Joachim Bengtsson joachimb@gmail.com