Merge remote-tracking branch 'origin/master'

docs/admin/auth.rst

@@ -167,6 +167,8 @@ Can accept suggestion [Users, Managers]
     Can accept suggestion (might be disabled with :ref:`voting`).
 Can delete suggestion [Users, Managers]
     Can delete suggestion (might be disabled with :ref:`voting`).
+Can delete comment [Managers]
+    Can delete comment.
 Can vote for suggestion [Users, Managers]
     Can vote for suggestion (see :ref:`voting`).
 Can override suggestion state [Managers]

docs/changes.rst

@@ -10,6 +10,7 @@ Released on ? 2015.
 * Fulltext search on location and comments fields.
 * New SVG/javascript based activity charts.
 * Support for Django 1.8.
+* Support for deleting comments.
 
 weblate 2.1
 -----------

weblate/accounts/models.py

@@ -661,6 +661,7 @@ def create_groups(update):
             Permission.objects.get(codename='accept_suggestion'),
             Permission.objects.get(codename='vote_suggestion'),
             Permission.objects.get(codename='override_suggestion'),
+            Permission.objects.get(codename='delete_comment'),
             Permission.objects.get(codename='delete_suggestion'),
             Permission.objects.get(codename='ignore_check'),
             Permission.objects.get(codename='upload_dictionary'),

weblate/html/js/detail.html

@@ -76,7 +76,9 @@
 </tr>
 <tr>
 <td>
+{% with next as next_url %}
 {% include "list-comments.html" %}
+{% endwith %}
 </td>
 </tr>
 {% endif %}

weblate/html/list-comments.html

@@ -13,6 +13,14 @@
 {% endif %}
 </span>
 </div>
+{% if perms.trans.delete_comment %}
+<form method="POST" action="{% url 'delete-comment' pk=comment.pk %}">
+{% csrf_token %}
+<input type="hidden" name="next" value="{{ next_url }}" />
+<button class="btn btn-danger btn-xs pull-right flip"><i class="fa fa-trash"></i> {% trans "Delete" %}</button>
+</form>
+<div class="clearfix"></div>
+{% endif %}
 <div class="list-group">
 <div class="list-group-item" dir="auto">{{ comment.comment }}</div>
 </div>

weblate/html/translate.html

@@ -281,7 +281,9 @@
 <div class="panel panel-primary">
 <div class="panel-heading"><h4 class="panel-title">{% trans "Comments" %}</h4></div>
   <div class="panel-body">
+  {% with this_unit_url as next_url %}
     {% include "list-comments.html" %}
+  {% endwith %}
   </div>
 </div>
 {% endif %}

weblate/trans/views/edit.py

@@ -19,6 +19,7 @@
 #
 
 from django.shortcuts import render, get_object_or_404, redirect
+from django.views.decorators.http import require_POST
 from django.utils.translation import ugettext as _
 from django.http import HttpResponseRedirect, HttpResponse
 from django.contrib import messages
@@ -28,7 +29,8 @@ import uuid
 import time
 
 from weblate.trans.models import (
-    SubProject, Unit, Change, Comment, Suggestion, Dictionary
+    SubProject, Unit, Change, Comment, Suggestion, Dictionary,
+    get_related_units,
 )
 from weblate.trans.autofixes import fix_target
 from weblate.trans.forms import (
@@ -678,6 +680,27 @@ def comment(request, pk):
     return redirect(request.POST.get('next', translation))
 
 
+@login_required
+@require_POST
+def delete_comment(request, pk):
+    """
+    Deletes comment.
+    """
+    comment = get_object_or_404(Comment, pk=pk)
+    comment.project.check_acl(request)
+
+    units = get_related_units(comment)
+    if units.exists():
+        fallback_url = units[0].get_absolute_url()
+    else:
+        fallback_url = comment.project.get_absolute_url()
+
+    comment.delete()
+    messages.info(request, _('Translation comment has been deleted.'))
+
+    return redirect(request.POST.get('next', fallback_url))
+
+
 def get_zen_unitdata(translation, request):
     '''
     Loads unit data for zen mode.

weblate/urls.py

@@ -272,6 +272,11 @@ urlpatterns = patterns(
         'weblate.trans.views.edit.comment',
         name='comment',
     ),
+    url(
+        r'^comment/(?P<pk>[0-9]+)/delete/$',
+        'weblate.trans.views.edit.delete_comment',
+        name='delete-comment',
+    ),
 
     # VCS manipulation - commit
     url(