aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/collection.html12
-rw-r--r--mediagoblin/templates/mediagoblin/utils/collection_gallery.html4
2 files changed, 8 insertions, 8 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection.html b/mediagoblin/templates/mediagoblin/user_pages/collection.html
index 87635dcb..988c6556 100644
--- 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.has_privilege(u'admin')) %}
+ {% if request.user and (collection.creator == request.user.id or
+ request.user.ghas_privilege('admin')) %}
{% set edit_url = request.urlgen('mediagoblin.edit.edit_collection',
user=collection.get_creator.username,
collection=collection.slug) %}
@@ -63,10 +63,10 @@
</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 %}
diff --git a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html
index 24bf6832..dfe2ebe2 100644
--- a/mediagoblin/templates/mediagoblin/utils/collection_gallery.html
+++ b/mediagoblin/templates/mediagoblin/utils/collection_gallery.html
@@ -38,8 +38,8 @@
<a href="{{ entry_url }}">{{ item.note }}</a>
{% endif %}
{% if request.user and
- (item.in_collection.creator == request.user.id or
- request.user.has_privilege(u'admin')) %}
+ (item.in_collection.creator == request.user.id or
+ request.user.has_privilege('admin')) %}
{%- set remove_url=request.urlgen(
'mediagoblin.user_pages.collection_item_confirm_remove',
user=item.in_collection.get_creator.username,