collection browsing: rename view/template user_collections -> collection_list

Rationale, avoid confusion between views user_collection and user_collections
(note trailing "s"). Ditto for the collection(s).html templates.
This commit is contained in:
Stefano Zacchiroli 2013-01-15 23:11:33 +01:00
parent 947f38c0b9
commit 4f8f0353b1
4 changed files with 5 additions and 5 deletions

View File

@ -27,7 +27,7 @@
<li><a href="{{ request.urlgen('mediagoblin.submit.start') }}">
{%- trans %}Add media{% endtrans -%}
</a></li>
<li><a href="{{ request.urlgen('mediagoblin.user_pages.user_collections',
<li><a href="{{ request.urlgen('mediagoblin.user_pages.collection_list',
user=request.user.username) }}">
{%- trans %}Browse collections{% endtrans -%}
</a></li>

View File

@ -48,9 +48,9 @@ add_route('mediagoblin.user_pages.media_collect',
'/u/<string:user>/m/<string:media>/collect/',
'mediagoblin.user_pages.views:media_collect')
add_route('mediagoblin.user_pages.user_collections',
add_route('mediagoblin.user_pages.collection_list',
'/u/<string:user>/collections/',
'mediagoblin.user_pages.views:user_collections')
'mediagoblin.user_pages.views:collection_list')
add_route('mediagoblin.user_pages.user_collection',
'/u/<string:user>/collection/<string:collection>/',

View File

@ -338,14 +338,14 @@ def user_collection(request, page, url_user=None):
@active_user_from_url
def user_collections(request, url_user=None):
def collection_list(request, url_user=None):
"""A User-defined Collection"""
collections = Collection.query.filter_by(
get_creator=url_user)
return render_to_response(
request,
'mediagoblin/user_pages/collections.html',
'mediagoblin/user_pages/collection_list.html',
{'user': url_user,
'collections': collections})