heckyel/mediagoblin
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin

Browse Source
This commit is contained in:
Joar Wandborg
2011-06-15 22:18:24 +02:00
parent a48014d67a 0e9dd2a286
commit 9e883ed3b2
24 changed files with 374 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mediagoblin/db/migrations.py
View File

@@ -16,8 +16,6 @@
from mongokit import DocumentMigration
from mediagoblin import globals as mediagoblin_globals
class MediaEntryMigration(DocumentMigration):
def allmigration01_uploader_to_reference(self):

4
mediagoblin/db/models.py
View File

@@ -20,7 +20,7 @@ from mongokit import Document, Set
from mediagoblin import util
from mediagoblin.auth import lib as auth_lib
from mediagoblin import globals as mediagoblin_globals
from mediagoblin import mg_globals
from mediagoblin.db import migrations
from mediagoblin.db.util import ObjectId
@@ -115,7 +115,7 @@ class MediaEntry(Document):
def generate_slug(self):
self['slug'] = util.slugify(self['title'])
duplicate = mediagoblin_globals.database.media_entries.find_one(
duplicate = mg_globals.database.media_entries.find_one(
{'slug': self['slug']})
if duplicate: