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 988c65561c3f9a23b8ce41c63153d3a7674ffa4c..71ba4451219e393dad9cc6cec2a88b37fb893a33 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/collection.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/collection.html
@@ -44,14 +44,14 @@
       {{ collection_title }} by <a href="{{ user_url }}">{{ username }}</a>
     {%- endtrans %}
   </h1>
-  {% if request.user and (collection.creator == request.user.id or
-                                                request.user.ghas_privilege('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 %}