diff options
| author | lora <lorochka85@gmail.com> | 2011-11-19 17:01:40 -0600 |
|---|---|---|
| committer | lora <lorochka85@gmail.com> | 2011-11-19 17:01:40 -0600 |
| commit | 707001950a42c7adfd6657f227a2c2dbbd09afce (patch) | |
| tree | 9a7215448098b8681b2b45fe636eb8af6c3ea8ba /mediagoblin/listings | |
| parent | 2d62e9efd210becd30982e65e06a6ef97029b391 (diff) | |
| parent | aea6d577cbf4d937427dea173f74fb17ad45bd75 (diff) | |
| download | mediagoblin-707001950a42c7adfd6657f227a2c2dbbd09afce.tar.lz mediagoblin-707001950a42c7adfd6657f227a2c2dbbd09afce.tar.xz mediagoblin-707001950a42c7adfd6657f227a2c2dbbd09afce.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/listings')
| -rw-r--r-- | mediagoblin/listings/routing.py | 1 | ||||
| -rw-r--r-- | mediagoblin/listings/views.py | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/listings/routing.py b/mediagoblin/listings/routing.py index b72bd015..234f2595 100644 --- a/mediagoblin/listings/routing.py +++ b/mediagoblin/listings/routing.py @@ -25,4 +25,3 @@ tag_routes = [ Route('mediagoblin.listings.tag_atom_feed', "/{tag}/atom/", controller="mediagoblin.listings.views:tag_atom_feed"), ] - diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py index 01aad803..12e539e7 100644 --- a/mediagoblin/listings/views.py +++ b/mediagoblin/listings/views.py @@ -47,7 +47,7 @@ def tag_listing(request, page): {u'state': u'processed', u'tags.slug': tag_slug}) cursor = cursor.sort('created', DESCENDING) - + pagination = Pagination(page, cursor) media_entries = pagination() @@ -64,6 +64,7 @@ def tag_listing(request, page): ATOM_DEFAULT_NR_OF_UPDATED_ITEMS = 15 + def tag_atom_feed(request): """ generates the atom feed with the tag images |