Merge pull request #1752 from MTG/comments_n_plus_1

Simplify check in flag_user

accounts/templatetags/flag_user.py

@@ -19,31 +19,34 @@
 #
 
 from django import template
+
 from accounts.models import UserFlag
+
 register = template.Library()
 
 
 @register.inclusion_tag("accounts/flag_user.html", takes_context=True)
-def flag_user(context, flag_type, username, content_id, text = None, user_sounds = None):
+def flag_user(context, flag_type, username, content_id, text=None, user_sounds=None):
 
     no_show = False
     link_text = "Report spam/offensive"
 
-    if not context['request'].user.is_authenticated:
+    has_sounds = user_sounds is not None and user_sounds > 0
+    if not context['request'].user.is_authenticated or has_sounds:
         no_show = True
-        flagged = []
+        flagged = False
     else:
-        flagged = UserFlag.objects.filter(user__username=username,
-                                          reporting_user=context['request'].user,
-                                          object_id=content_id).values('reporting_user').distinct()
+        flagged = UserFlag.objects.filter(
+            user__username=username, reporting_user=context['request'].user, object_id=content_id
+        ).exists()
         if text:
             link_text = text
 
-    return {'user_sounds': user_sounds,
-            'done_text': "Marked as spam/offensive",  # Not used in BW
-            'flagged': len(flagged),
-            'flag_type': flag_type,
-            'username': username,
-            'content_obj_id': content_id,
-            'link_text': link_text,
-            'no_show': no_show}
+    return {
+        'flagged': flagged,
+        'flag_type': flag_type,
+        'username': username,
+        'content_obj_id': content_id,
+        'link_text': link_text,
+        'no_show': no_show
+    }

templates/accounts/flag_user.html

@@ -1,17 +1,13 @@
 {% load static %}
-{% if no_show %}
-    <!-- do noting -->
-{% else %}
-    {% if user_sounds < 1 %}
-        <div>
-            <span class="text-light-grey" id="{{content_obj_id}}{{flag_type}}_link">
-            {% if flagged %}
-                Marked as spam/offensive
-            {% else %}
-                <a aria-label="Report spam/offensive" class="text-grey post-flag" data-content-obj-id="{{content_obj_id}}" data-flag-type="{{ flag_type }}" data-post-flag-url="{% url "flag-user" username %}" href="javascript:void(0)">{{ link_text }}</a>
-            {% endif %}
-            </span>
-            <span class="text-light-grey" id="{{content_obj_id}}{{flag_type}}_wheel"></span>
-        </div>
-    {% endif %}
+{% if not no_show %}
+    <div>
+        <span class="text-light-grey" id="{{content_obj_id}}{{flag_type}}_link">
+        {% if flagged %}
+            Marked as spam/offensive
+        {% else %}
+            <a aria-label="Report spam/offensive" class="text-grey post-flag" data-content-obj-id="{{content_obj_id}}" data-flag-type="{{ flag_type }}" data-post-flag-url="{% url "flag-user" username %}" href="javascript:void(0)">{{ link_text }}</a>
+        {% endif %}
+        </span>
+        <span class="text-light-grey" id="{{content_obj_id}}{{flag_type}}_wheel"></span>
+    </div>
 {% endif %}