aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/mixin.py
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-01-11 11:16:35 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-01-11 11:16:35 +0100
commitcb7ae1e4331f3521b2028388c3d4ff2555d61eb3 (patch)
treebc3af2496a75d61afe2485d90cf80e68c55bf608 /mediagoblin/db/mixin.py
parent73079ac4b8a8b3b355867a1e98aca63313597ad0 (diff)
downloadmediagoblin-cb7ae1e4331f3521b2028388c3d4ff2555d61eb3.tar.lz
mediagoblin-cb7ae1e4331f3521b2028388c3d4ff2555d61eb3.tar.xz
mediagoblin-cb7ae1e4331f3521b2028388c3d4ff2555d61eb3.zip
Fix url_for_self mixup
Move changes from mongo/models:url_for_self back into mixin:url_for_self.
Diffstat (limited to 'mediagoblin/db/mixin.py')
-rw-r--r--mediagoblin/db/mixin.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 4fb325d2..5145289e 100644
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -63,7 +63,7 @@ class MediaEntryMixin(object):
def main_mediafile(self):
pass
- def url_for_self(self, urlgen):
+ def url_for_self(self, urlgen, **extra_args):
"""
Generate an appropriate url for ourselves
@@ -75,12 +75,14 @@ class MediaEntryMixin(object):
return urlgen(
'mediagoblin.user_pages.media_home',
user=uploader.username,
- media=self.slug)
+ media=self.slug,
+ **extra_args)
else:
return urlgen(
'mediagoblin.user_pages.media_home',
user=uploader.username,
- media=unicode(self._id))
+ media=unicode(self._id),
+ **extra_args)
def get_fail_exception(self):
"""