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

Use media.url_for_self instead of calling urlgen directly

Browse Source 
Replace
	urlgen('ID', user=media.get_uploader().username, media=media.*)
by
	media.url_for_self(urlgen)
in a few places.
It's just a lot nicer!
This commit is contained in:
Elrond 2011-12-20 18:47:33 +01:00
parent 479e8a833b
commit 0eb649ff7a
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/db/mongo/models.py
View File

@ -282,10 +282,8 @@ class MediaEntry(Document):
'uploader': self.uploader, 'uploader': self.uploader,
'state': 'processed'}).sort( 'state': 'processed'}).sort(
'_id', ASCENDING).limit(1) '_id', ASCENDING).limit(1)
if cursor.count(): for media in cursor:
return urlgen('mediagoblin.user_pages.media_home', return media.url_for_self(urlgen)
user=self.get_uploader().username,
media=unicode(cursor[0].slug))
def url_to_next(self, urlgen): def url_to_next(self, urlgen):
""" """
@ -296,10 +294,8 @@ class MediaEntry(Document):
'state': 'processed'}).sort( 'state': 'processed'}).sort(
'_id', DESCENDING).limit(1) '_id', DESCENDING).limit(1)
if cursor.count(): for media in cursor:
return urlgen('mediagoblin.user_pages.media_home', return media.url_for_self(urlgen)
user=self.get_uploader().username,
media=unicode(cursor[0].slug))
def get_uploader(self): def get_uploader(self):
return self.db.User.find_one({'_id': self.uploader}) return self.db.User.find_one({'_id': self.uploader})

6
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -135,10 +135,8 @@
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
{{ render_pagination(request, pagination, {{ render_pagination(request, pagination,
request.urlgen('mediagoblin.user_pages.media_home', media.url_for_self(request.urlgen)) }}
user = media.get_uploader().username,
media = media._id)) }}
{% endif %} {% endif %}
</div> </div>
<div class="grid_5 omega"> <div class="grid_5 omega">