heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix error in collection templates.

Browse Source 
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'
This commit is contained in:
Devan Goodwin 2013-10-20 17:06:56 -03:00
parent 9d2b0161b9
commit f1bf5ccdd8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/templates/mediagoblin/user_pages/collection.html
View File

@ -44,8 +44,8 @@
{{ collection_title }} by <a href="{{ user_url }}">{{ username }}</a> {{ collection_title }} by <a href="{{ user_url }}">{{ username }}</a>
{%- endtrans %} {%- endtrans %}
</h1> </h1>
{% if request.user and (collection.creator == request.user.id or {% if request.user and (collection.creator == request.user.id or
request.user.has_privilege(u'admin')) %} request.user.ghas_privilege('admin')) %}
{% set edit_url = request.urlgen('mediagoblin.edit.edit_collection', {% set edit_url = request.urlgen('mediagoblin.edit.edit_collection',
user=collection.get_creator.username, user=collection.get_creator.username,
collection=collection.slug) %} collection=collection.slug) %}
@ -63,10 +63,10 @@
</p> </p>
{{ collection_gallery(request, collection_items, pagination) }} {{ collection_gallery(request, collection_items, pagination) }}
{% set feed_url = request.urlgen('mediagoblin.user_pages.collection_atom_feed', {% set feed_url = request.urlgen('mediagoblin.user_pages.collection_atom_feed',
user=user.username, user=user.username,
collection=collection.slug ) %} collection=collection.slug ) %}
{% include "mediagoblin/utils/feed_link.html" %} {% include "mediagoblin/utils/feed_link.html" %}
{% endblock %} {% endblock %}

4
mediagoblin/templates/mediagoblin/utils/collection_gallery.html
View File

@ -38,8 +38,8 @@
<a href="{{ entry_url }}">{{ item.note }}</a> <a href="{{ entry_url }}">{{ item.note }}</a>
{% endif %} {% endif %}
{% if request.user and {% if request.user and
(item.in_collection.creator == request.user.id or (item.in_collection.creator == request.user.id or
request.user.has_privilege(u'admin')) %} request.user.has_privilege('admin')) %}
{%- set remove_url=request.urlgen( {%- set remove_url=request.urlgen(
'mediagoblin.user_pages.collection_item_confirm_remove', 'mediagoblin.user_pages.collection_item_confirm_remove',
user=item.in_collection.get_creator.username, user=item.in_collection.get_creator.username,