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

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

diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection.html b/mediagoblin/templates/mediagoblin/user_pages/collection.html
index 7ea84876fa3a03a4187bf66dbb940829f3c94091..87635dcb04c673834ce65377a9fa79786941e94d 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/collection.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/collection.html
@@ -44,8 +44,8 @@
       {{ collection_title }} by <a href="{{ user_url }}">{{ username }}</a>
     {%- endtrans %}
   </h1>
-  {% if request.user and (collection.creator == request.user._id or 
-                                                request.user.is_admin) %}
+  {% if request.user and (collection.creator == request.user.id or 
+                                                request.user.has_privilege(u'admin')) %}
     {% set edit_url = request.urlgen('mediagoblin.edit.edit_collection',
                                      user=collection.get_creator.username,
                                      collection=collection.slug) %}
@@ -56,11 +56,11 @@
     <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
   {% endif %}
 
-  {%- trans collection_description=collection.description -%}
   <p>
-    {{ collection_description }}
+    {% autoescape False %}
+      {{ collection.description_html }}
+    {% endautoescape %}
   </p>
-  {%- endtrans %}
 
   {{ collection_gallery(request, collection_items, pagination) }}