aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/db/mongo
diff options
context:
space:
mode:
authorMichele Azzolari <macno@macno.org>2012-01-05 18:48:23 +0100
committerChristopher Allan Webber <cwebber@dustycloud.org>2012-01-10 08:10:53 -0600
commit1df68a3524d92caee5601a8acc011ac8e1fe16d4 (patch)
treed3e2c929e1c13dab4af1a1da9caf27f4992c2f56 /mediagoblin/db/mongo
parentbcd50908d2849dff5a466b15db65112779cb85e2 (diff)
downloadmediagoblin-1df68a3524d92caee5601a8acc011ac8e1fe16d4.tar.lz
mediagoblin-1df68a3524d92caee5601a8acc011ac8e1fe16d4.tar.xz
mediagoblin-1df68a3524d92caee5601a8acc011ac8e1fe16d4.zip
Fixed #724 and added extra infos to the atom feed (author uri and links to the html version of each entry)
Diffstat (limited to 'mediagoblin/db/mongo')
-rw-r--r--mediagoblin/db/mongo/models.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/mediagoblin/db/mongo/models.py b/mediagoblin/db/mongo/models.py
index 5de59c12..f1e8eae6 100644
--- a/mediagoblin/db/mongo/models.py
+++ b/mediagoblin/db/mongo/models.py
@@ -255,7 +255,7 @@ class MediaEntry(Document):
if duplicate:
self.slug = "%s-%s" % (self._id, self.slug)
- def url_for_self(self, urlgen):
+ def url_for_self(self, urlgen, **extra_args):
"""
Generate an appropriate url for ourselves
@@ -267,12 +267,14 @@ class MediaEntry(Document):
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 url_to_prev(self, urlgen):
"""