diff options
author | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
---|---|---|
committer | Jef van Schendel <jefvanschendel@gmail.com> | 2011-06-15 23:25:47 +0200 |
commit | bb770e295cd727429df524b0a5c3952ea449fdb2 (patch) | |
tree | e8a894c2a75e7ff53946b05508f82b501c37189e /mediagoblin/db/models.py | |
parent | bb10e5bef7ae062424b4c334a73c4ce988e37ccf (diff) | |
parent | 0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff) | |
download | mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.lz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.tar.xz mediagoblin-bb770e295cd727429df524b0a5c3952ea449fdb2.zip |
Merge remote-tracking branch 'gitorious/master'
Diffstat (limited to 'mediagoblin/db/models.py')
-rw-r--r-- | mediagoblin/db/models.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py index 3da97a49..d77cf619 100644 --- a/mediagoblin/db/models.py +++ b/mediagoblin/db/models.py @@ -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 @@ -114,7 +114,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: |