From 2f64da625ef0e28aa7c92f41be0e9bb10febfb37 Mon Sep 17 00:00:00 2001 From: Zambom Date: Thu, 9 Feb 2017 20:09:50 -0200 Subject: [PATCH] Adding comment deletion --- amadeus/static/css/base/amadeus.css | 2 +- amadeus/static/js/mural.js | 43 +++++++++++++++++++++++++++++++++++++++++++ mural/templates/mural/_view_comment.html | 2 +- mural/templates/mural/delete.html | 2 +- mural/urls.py | 2 ++ mural/views.py | 30 ++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 3 deletions(-) diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css index e5b9c00..bd1051f 100755 --- a/amadeus/static/css/base/amadeus.css +++ b/amadeus/static/css/base/amadeus.css @@ -1026,7 +1026,7 @@ li.item .notify_badge { margin: 0; } -.post .post-user .btn-group .dropdown-menu a { +.post .post-user .btn-group .dropdown-menu a, .comment .comment-user .btn-group .dropdown-menu a { cursor: pointer; } diff --git a/amadeus/static/js/mural.js b/amadeus/static/js/mural.js index 2869388..18d20e9 100644 --- a/amadeus/static/js/mural.js +++ b/amadeus/static/js/mural.js @@ -268,4 +268,47 @@ function setCommentFormSubmit(post, comment = "") { return false; }); +} + +function deleteComment(btn) { + var url = btn.data('url'); + var comment = btn.data('id'); + + console.log(comment); + + $.ajax({ + url: url, + success: function (data) { + $('#post-modal-form').html(data); + + setCommentDeleteSubmit(comment); + + $('#post-modal-form').modal('show'); + } + }); +} + +function setCommentDeleteSubmit (comment) { + var frm = $("#delete_form"); + + frm.submit(function () { + $.ajax({ + type: frm.attr('method'), + url: frm.attr('action'), + data: frm.serialize(), + success: function (response) { + + $("#comment-" + comment).remove(); + + $('#post-modal-form').modal('hide'); + + alertify.success(response.msg); + }, + error: function (data) { + console.log(data); + } + }); + + return false; + }); } \ No newline at end of file diff --git a/mural/templates/mural/_view_comment.html b/mural/templates/mural/_view_comment.html index 6e0cc3a..c6c5bd0 100644 --- a/mural/templates/mural/_view_comment.html +++ b/mural/templates/mural/_view_comment.html @@ -21,7 +21,7 @@ {% endif %} diff --git a/mural/templates/mural/delete.html b/mural/templates/mural/delete.html index 28ac6c0..08b1b46 100644 --- a/mural/templates/mural/delete.html +++ b/mural/templates/mural/delete.html @@ -5,7 +5,7 @@
{% csrf_token %} -

{% trans 'Are you sure you want to delete this post' %}?

+

{{ message }}

diff --git a/mural/urls.py b/mural/urls.py index 8d73c26..935972a 100644 --- a/mural/urls.py +++ b/mural/urls.py @@ -10,6 +10,8 @@ urlpatterns = [ url(r'^deleted/$', views.deleted_post, name='deleted_post'), url(r'^comment/(?P[\w_-]+)/$', views.CommentCreate.as_view(), name='create_comment'), url(r'^update_comment/(?P[\w_-]+)/$', views.CommentUpdate.as_view(), name='update_comment'), + url(r'^delete_comment/(?P[\w_-]+)/$', views.CommentDelete.as_view(), name='delete_comment'), + url(r'^deleted_comment/$', views.deleted_comment, name='deleted_comment'), url(r'^render_comment/([\w_-]+)/([\w_-]+)/$', views.render_comment, name='render_comment'), url(r'^render_post/([\w_-]+)/([\w_-]+)/$', views.render_gen_post, name='render_post_general'), url(r'^suggest_users/$', views.suggest_users, name='suggest_users'), diff --git a/mural/views.py b/mural/views.py index 46b7d91..7ba5e51 100644 --- a/mural/views.py +++ b/mural/views.py @@ -186,6 +186,7 @@ class GeneralDelete(LoginRequiredMixin, generic.DeleteView): context = super(GeneralDelete, self).get_context_data(*args, **kwargs) context['form_url'] = reverse_lazy("mural:delete_general", args = (), kwargs = {'pk': self.object.id}) + context['message'] = _('Are you sure you want to delete this post?') return context @@ -332,6 +333,32 @@ class CommentUpdate(LoginRequiredMixin, generic.UpdateView): def get_success_url(self): return reverse_lazy('mural:render_comment', args = (self.object.id, 'update', )) +class CommentDelete(LoginRequiredMixin, generic.DeleteView): + login_url = reverse_lazy("users:login") + redirect_field_name = 'next' + + template_name = 'mural/delete.html' + model = Comment + + def get_context_data(self, *args, **kwargs): + context = super(CommentDelete, self).get_context_data(*args, **kwargs) + + context['form_url'] = reverse_lazy("mural:delete_comment", args = (), kwargs = {'pk': self.object.id}) + context['message'] = _('Are you sure you want to delete this comment?') + + return context + + def get_success_url(self): + users = User.objects.all().exclude(id = self.request.user.id) + + notify_type = "mural" + pathname = reverse("mural:manage_general") + + #for user in users: + # Group("user-%s" % user.id).send({'text': json.dumps({"type": notify_type, "subtype": "delete", "pathname": pathname, "post_id": self.object.id})}) + + return reverse_lazy('mural:deleted_comment') + def render_comment(request, comment, msg): comment = get_object_or_404(Comment, id = comment) @@ -349,6 +376,9 @@ def render_comment(request, comment, msg): return JsonResponse({'message': msg, 'view': html, 'new_id': comment.id}) +def deleted_comment(request): + return JsonResponse({'msg': _('Comment deleted successfully!')}) + def suggest_users(request): param = request.GET.get('param', '') -- libgit2 0.21.2