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

Dot-Notation for MediaEntry.slug

Browse Source
This commit is contained in:
Elrond 2011-12-04 19:57:42 +01:00
parent ec82fbd85c
commit 5da0bf901b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mediagoblin/db/models.py
View File

@ -249,13 +249,13 @@ class MediaEntry(Document):
pass pass
def generate_slug(self): def generate_slug(self):
self['slug'] = url.slugify(self.title) self.slug = url.slugify(self.title)
duplicate = mg_globals.database.media_entries.find_one( duplicate = mg_globals.database.media_entries.find_one(
{'slug': self['slug']}) {'slug': self.slug})
if duplicate: if duplicate:
self['slug'] = "%s-%s" % (self._id, self['slug']) self.slug = "%s-%s" % (self._id, self.slug)
def url_for_self(self, urlgen): def url_for_self(self, urlgen):
""" """
@ -269,7 +269,7 @@ class MediaEntry(Document):
return urlgen( return urlgen(
'mediagoblin.user_pages.media_home', 'mediagoblin.user_pages.media_home',
user=uploader.username, user=uploader.username,
media=self['slug']) media=self.slug)
else: else:
return urlgen( return urlgen(
'mediagoblin.user_pages.media_home', 'mediagoblin.user_pages.media_home',
@ -287,7 +287,7 @@ class MediaEntry(Document):
if cursor.count(): if cursor.count():
return urlgen('mediagoblin.user_pages.media_home', return urlgen('mediagoblin.user_pages.media_home',
user=self.get_uploader().username, user=self.get_uploader().username,
media=unicode(cursor[0]['slug'])) media=unicode(cursor[0].slug))
def url_to_next(self, urlgen): def url_to_next(self, urlgen):
""" """
@ -301,7 +301,7 @@ class MediaEntry(Document):
if cursor.count(): if cursor.count():
return urlgen('mediagoblin.user_pages.media_home', return urlgen('mediagoblin.user_pages.media_home',
user=self.get_uploader().username, user=self.get_uploader().username,
media=unicode(cursor[0]['slug'])) 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})

4
mediagoblin/edit/views.py
View File

@ -44,7 +44,7 @@ def edit_media(request, media):
defaults = dict( defaults = dict(
title=media.title, title=media.title,
slug=media['slug'], slug=media.slug,
description=media['description'], description=media['description'],
tags=media_tags_as_string(media['tags'])) tags=media_tags_as_string(media['tags']))
@ -72,7 +72,7 @@ def edit_media(request, media):
media['description_html'] = cleaned_markdown_conversion( media['description_html'] = cleaned_markdown_conversion(
media['description']) media['description'])
media['slug'] = unicode(request.POST['slug']) media.slug = unicode(request.POST['slug'])
media.save() media.save()
return exc.HTTPFound( return exc.HTTPFound(