diff options
| author | Devan Goodwin <dgoodwin@rm-rf.ca> | 2013-10-20 17:06:56 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@rm-rf.ca> | 2013-10-20 17:06:56 -0300 |
| commit | f1bf5ccdd89658cb50ae04368f71ccbf4d5a6ac3 (patch) | |
| tree | d9c33860fa99698c6c8c4e3accd23078ec598a7a | |
| parent | 9d2b0161b9e6f570e7b429127d6ebb83c125c1c6 (diff) | |
| download | mediagoblin-f1bf5ccdd89658cb50ae04368f71ccbf4d5a6ac3.tar.lz mediagoblin-f1bf5ccdd89658cb50ae04368f71ccbf4d5a6ac3.tar.xz mediagoblin-f1bf5ccdd89658cb50ae04368f71ccbf4d5a6ac3.zip | |
Fix error in collection templates.
Removed unicode strings from some recently added has_privilege calls.
Appears this is not valid syntax as it would be in the python code
itself. Causes an error showing the template:
Error - <class 'jinja2.exceptions.TemplateSyntaxError?'>: expected token
',', got 'string'
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/collection.html | 12 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/collection_gallery.html | 4 |
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, |