Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update'

[mediagoblin.git] / mediagoblin / templates / mediagoblin / user_pages / media.html

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 62c2a48c59f05a3e5a5bca38a18ac4130ec0c0cc..81e5013e88e812ab04caa2d696e168e4a7f1a4d6 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -147,15 +147,13 @@
             {%- endautoescape %}
           </div>
           <div>
-                <a {% if not request.user -%}
-                    href="{{ request.urlgen('mediagoblin.auth.login') }}"
-                  {%- else %}
-                    href="{{ request.urlgen('mediagoblin.user_pages.media_home.report_comment',
+            {% if app_config.allow_reporting %}
+                <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.report_comment',
                             user=media.get_uploader.username,
                              media=media.slug_or_id,
-                             comment=comment.id) }}"
-                  {%- endif %}>
-                    {% trans %} Report {% endtrans %}</a>
+                             comment=comment.id) }}">
+                    {% trans %}Report{% endtrans %}</a>
+            {% endif %}
           </div>
         </li>
       {% endfor %}
@@ -181,7 +179,9 @@
 
     {% include "mediagoblin/utils/collections.html" %}
 
-    {% include "mediagoblin/utils/report.html" %}
+    {% if app_config.allow_reporting %}
+      {% include "mediagoblin/utils/report.html" %}
+    {% endif %}
 
     {% include "mediagoblin/utils/license.html" %}