diff --git a/pedagogy/forms.py b/pedagogy/forms.py index e16db188..9180516d 100644 --- a/pedagogy/forms.py +++ b/pedagogy/forms.py @@ -130,8 +130,16 @@ class UVCommentModerationForm(forms.Form): Form handeling bulk comment deletion """ - reports = forms.ModelMultipleChoiceField( + accepted_reports = forms.ModelMultipleChoiceField( UVCommentReport.objects.all(), - label=_("Reported comments"), + label=_("Accepted reports"), widget=forms.CheckboxSelectMultiple, + required=False, + ) + + denied_reports = forms.ModelMultipleChoiceField( + UVCommentReport.objects.all(), + label=_("Denied reports"), + widget=forms.CheckboxSelectMultiple, + required=False, ) diff --git a/pedagogy/templates/pedagogy/moderation.jinja b/pedagogy/templates/pedagogy/moderation.jinja index 5960ac3e..32ae8485 100644 --- a/pedagogy/templates/pedagogy/moderation.jinja +++ b/pedagogy/templates/pedagogy/moderation.jinja @@ -6,9 +6,9 @@ {% endblock title %} {% block content %} -
+ {% endblock content %} diff --git a/pedagogy/views.py b/pedagogy/views.py index bb1ab78e..21feb15e 100644 --- a/pedagogy/views.py +++ b/pedagogy/views.py @@ -247,8 +247,10 @@ class UVModerationFormView(FormView): def form_valid(self, form): form_clean = form.clean() - for report in form_clean.get("reports", []): - report.comment.delete() + for report in form_clean.get("accepted_reports", []): + report.comment.delete() # Delete the related comment + for report in form_clean.get("denied_reports", []): + report.delete() # Delete the report itself return super(UVModerationFormView, self).form_valid(form) def get_success_url(self):