From 75a2aefd696c7eb5153cc51b9c28c49aa7ed8576 Mon Sep 17 00:00:00 2001 From: Bartuccio Antoine Date: Thu, 20 Jun 2019 15:03:51 +0200 Subject: [PATCH] pedagogy: display if comment is reported --- pedagogy/models.py | 8 ++++++++ pedagogy/templates/pedagogy/uv_detail.jinja | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pedagogy/models.py b/pedagogy/models.py index 8a6aa7d5..cf75a1ad 100644 --- a/pedagogy/models.py +++ b/pedagogy/models.py @@ -27,6 +27,7 @@ from django.utils.translation import ugettext_lazy as _ from django.utils import timezone from django.core import validators from django.conf import settings +from django.utils.functional import cached_property from core.models import User @@ -165,6 +166,13 @@ class UVComment(models.Model): """ return self.author == user or user.is_owner(self.uv) + @cached_property + def is_reported(self): + """ + Return True if someone reported this UV + """ + return self.reports.exists() + def __str__(self): return "%s - %s" % (self.uv, self.author) diff --git a/pedagogy/templates/pedagogy/uv_detail.jinja b/pedagogy/templates/pedagogy/uv_detail.jinja index b7c2a41f..6ddc7c2e 100644 --- a/pedagogy/templates/pedagogy/uv_detail.jinja +++ b/pedagogy/templates/pedagogy/uv_detail.jinja @@ -28,7 +28,10 @@ {% if user.is_owner(comment) %}

{% trans %}Edit{% endtrans %}

{% trans %}Delete{% endtrans %}

-

{% trans %}Report{% endtrans %}

+ {% endif %} +

{% trans %}Report{% endtrans %}

+ {% if comment.is_reported %} +

{% trans %}This comment has been reported{% endtrans %}

{% endif %} {% endfor %} {% endif %}