diff --git a/ratings/templates/ratings/ratingreply_form.html b/ratings/templates/ratings/ratingreply_form.html
new file mode 100644
index 00000000..032b12c3
--- /dev/null
+++ b/ratings/templates/ratings/ratingreply_form.html
@@ -0,0 +1,36 @@
+{% extends "extensions/base.html" %}
+{% load i18n common %}
+
+{% block page_title %}Reply to rating{% endblock page_title %}
+
+{% block content %}
+
Reply to review
+
+
+ {% include "ratings/components/rating.html" with classes="mb-2" %}
+
+
+
+{% endblock content %}
diff --git a/ratings/tests/test_views.py b/ratings/tests/test_views.py
index 95682dd6..23404213 100644
--- a/ratings/tests/test_views.py
+++ b/ratings/tests/test_views.py
@@ -163,3 +163,18 @@ class AddRatingViewTest(TestCase):
rating = Rating.objects.first()
self.assertEqual(rating.score, 3)
self.assertEqual(rating.text, text)
+
+ def test_reply(self):
+ version = create_approved_version(ratings=[])
+ rating = RatingFactory(version=version, text='some text', status=Rating.STATUSES.APPROVED)
+
+ random_user = UserFactory()
+ self.client.force_login(random_user)
+ response = self.client.post(rating.get_reply_url(), {'text': 'some reply'})
+ self.assertEqual(response.status_code, 403)
+
+ self.client.force_login(version.extension.authors.first())
+ response = self.client.post(rating.get_reply_url(), {'text': 'some reply'})
+ self.assertEqual(response.status_code, 302)
+ rating.refresh_from_db()
+ self.assertTrue(hasattr(rating, 'ratingreply'))
diff --git a/ratings/urls.py b/ratings/urls.py
index e88706c2..c319a871 100644
--- a/ratings/urls.py
+++ b/ratings/urls.py
@@ -11,6 +11,11 @@ urlpatterns = [
[
path('
/reviews/', views.RatingsView.as_view(), name='for-extension'),
path('/reviews/new/', views.AddRatingView.as_view(), name='new'),
+ path(
+ '/reviews//reply/',
+ views.AddRatingReplyView.as_view(),
+ name='reply',
+ ),
]
),
)
diff --git a/ratings/views.py b/ratings/views.py
index b3459b5d..c213b119 100644
--- a/ratings/views.py
+++ b/ratings/views.py
@@ -5,7 +5,7 @@ from django.views.generic.edit import CreateView
from django.views.generic.list import ListView
from ratings.forms import AddRatingForm
-from ratings.models import Rating
+from ratings.models import Rating, RatingReply
import extensions.views.mixins
log = logging.getLogger(__name__)
@@ -31,7 +31,18 @@ class RatingsView(extensions.views.mixins.ListedExtensionMixin, ListView):
def get_queryset(self):
self._set_score_filter()
- queryset = super().get_queryset().filter(extension_id=self.extension.pk)
+ queryset = (
+ super()
+ .get_queryset()
+ .filter(extension_id=self.extension.pk)
+ .select_related(
+ 'extension',
+ 'ratingreply',
+ 'ratingreply__user',
+ 'user',
+ 'version',
+ )
+ )
if self.score:
queryset = queryset.filter(score=self.score)
return queryset.distinct()
@@ -39,6 +50,7 @@ class RatingsView(extensions.views.mixins.ListedExtensionMixin, ListView):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['extension'] = self.extension
+ context['is_maintainer'] = self.extension.has_maintainer(self.request.user)
context['score'] = self.score
if self.request.user.is_authenticated:
context['my_rating'] = Rating.get_for(self.request.user.pk, self.extension.pk)
@@ -77,3 +89,39 @@ class AddRatingView(
def get_success_url(self) -> str:
return self.extension.get_ratings_url()
+
+
+class AddRatingReplyView(
+ extensions.views.mixins.ListedExtensionMixin,
+ UserPassesTestMixin,
+ LoginRequiredMixin,
+ CreateView,
+):
+ model = RatingReply
+ fields = ('text',)
+
+ def get_rating(self):
+ return Rating.objects.filter(pk=self.kwargs['pk'], extension=self.extension).first()
+
+ def test_func(self) -> bool:
+ # Check that user is replying to a rating for their exension and this is the first reply
+ rating = self.get_rating()
+ return (
+ rating
+ and not hasattr(rating, 'ratingreply')
+ and self.extension.has_maintainer(self.request.user)
+ )
+
+ def form_valid(self, form):
+ form.instance.rating = self.get_rating()
+ form.instance.user = self.request.user
+ return super().form_valid(form)
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context['extension'] = self.extension
+ context['rating'] = self.get_rating()
+ return context
+
+ def get_success_url(self) -> str:
+ return self.extension.get_ratings_url()
diff --git a/reviewers/views.py b/reviewers/views.py
index e5904dd2..4baff384 100644
--- a/reviewers/views.py
+++ b/reviewers/views.py
@@ -106,6 +106,7 @@ class ExtensionsApprovalDetailView(DetailView):
filtered_activity_types = {ApprovalActivity.ActivityType.COMMENT}
user = self.request.user
if self.object.has_maintainer(user):
+ ctx['is_maintainer'] = self.object.has_maintainer(self.request.user)
filtered_activity_types.add(ApprovalActivity.ActivityType.AWAITING_REVIEW)
if user.is_moderator or user.is_superuser:
filtered_activity_types.update(