diff options
| author | Aaron Williamson <aaron@copiesofcopies.org> | 2012-09-02 19:19:41 -0400 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-09-18 18:10:36 +0200 |
| commit | 256f816f509503676e8213c06ab9ce5db53bf7bb (patch) | |
| tree | b95be10317c5d86398379ee37bd3879d4d0e8ac1 | |
| parent | cdb35b9717756c13cbf89409b2d1bb125d283784 (diff) | |
| download | mediagoblin-256f816f509503676e8213c06ab9ce5db53bf7bb.tar.lz mediagoblin-256f816f509503676e8213c06ab9ce5db53bf7bb.tar.xz mediagoblin-256f816f509503676e8213c06ab9ce5db53bf7bb.zip | |
Fixed collection sidebar for media_home to user collection.url_for_self instead of incorrectly getting the session user
| -rw-r--r-- | mediagoblin/db/mixin.py | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/utils/collections.html | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py index 929c1c7f..e389fef5 100644 --- a/mediagoblin/db/mixin.py +++ b/mediagoblin/db/mixin.py @@ -183,7 +183,7 @@ class CollectionMixin(object): creator = self.get_creator return urlgen( - 'mediagoblin.user_pages.collections_home', + 'mediagoblin.user_pages.user_collection', user=creator.username, collection=self.slug_or_id, **extra_args) diff --git a/mediagoblin/templates/mediagoblin/utils/collections.html b/mediagoblin/templates/mediagoblin/utils/collections.html index feb5dac6..6cb5a342 100644 --- a/mediagoblin/templates/mediagoblin/utils/collections.html +++ b/mediagoblin/templates/mediagoblin/utils/collections.html @@ -25,17 +25,11 @@ {% if media.collections|length > 1 %} · {% endif %} - <a href="{{ request.urlgen( - 'mediagoblin.user_pages.user_collection', - collection=collection['slug'], user=request.user.username) }}">{{ collection['title'] }}</a> + <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> {% elif loop.revindex == 2 %} - <a href="{{ request.urlgen( - 'mediagoblin.user_pages.user_collection', - collection=collection['slug'], user=request.user.username) }}">{{ collection['title'] }}</a> + <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> {% else %} - <a href="{{ request.urlgen( - 'mediagoblin.user_pages.user_collection', - collection=collection['slug'], user=request.user.username) }}">{{ collection['title'] }}</a> · + <a href="{{ collection.url_for_self(request.urlgen) }}">{{ collection['title'] }}</a> · {% endif %} {% endfor %} </p> |