diff options
author | Stefano Zacchiroli <zack@upsilon.cc> | 2013-01-15 23:11:33 +0100 |
---|---|---|
committer | Stefano Zacchiroli <zack@upsilon.cc> | 2013-01-15 23:28:10 +0100 |
commit | 4f8f0353b191c71dfa876b12621c573f98e10d1d (patch) | |
tree | a98af88c49e7a38d1692049d805bd38f0b3d9d3f /mediagoblin/user_pages | |
parent | 947f38c0b92d967a3e16061ec067da4e21a51ae2 (diff) | |
download | mediagoblin-4f8f0353b191c71dfa876b12621c573f98e10d1d.tar.lz mediagoblin-4f8f0353b191c71dfa876b12621c573f98e10d1d.tar.xz mediagoblin-4f8f0353b191c71dfa876b12621c573f98e10d1d.zip |
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.
Diffstat (limited to 'mediagoblin/user_pages')
-rw-r--r-- | mediagoblin/user_pages/routing.py | 4 | ||||
-rw-r--r-- | mediagoblin/user_pages/views.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/user_pages/routing.py b/mediagoblin/user_pages/routing.py index 50243a2b..24bbab56 100644 --- a/mediagoblin/user_pages/routing.py +++ b/mediagoblin/user_pages/routing.py @@ -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>/', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index 9fbe953b..0727b58a 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -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}) |