Merge branch 'stable'

[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 f53c164f00f4f8510564f175ee18a8b910aa0cf0..71ba4451219e393dad9cc6cec2a88b37fb893a33 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/collection.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/collection.html
@@ -44,27 +44,29 @@
       {{ 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.actor == request.user.id or
+                                                request.user.has_privilege('admin')) %}
     {% set edit_url = request.urlgen('mediagoblin.edit.edit_collection',
-                                     user=collection.get_creator.username,
+                                     user=collection.get_actor.username,
                                      collection=collection.slug) %}
     <a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
     {% set delete_url = request.urlgen('mediagoblin.user_pages.collection_confirm_delete',
-                          user=collection.get_creator.username,
+                          user=collection.get_actor.username,
                           collection=collection.slug) %}
     <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
   {% endif %}
 
   <p>
-    {{ collection.description }}
+    {% autoescape False %}
+      {{ collection.description_html }}
+    {% endautoescape %}
   </p>
 
   {{ collection_gallery(request, collection_items, pagination) }}
-    
+
   {% set feed_url = request.urlgen('mediagoblin.user_pages.collection_atom_feed',
-                                   user=user.username, 
+                                   user=user.username,
                                    collection=collection.slug ) %}
   {% include "mediagoblin/utils/feed_link.html" %}
-    
-{% endblock %}    
+
+{% endblock %}