diff options
| author | Joar Wandborg <git@wandborg.com> | 2011-06-15 22:18:24 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2011-06-15 22:18:24 +0200 |
| commit | 9e883ed3b223311e3325e41e75dec7ee82875ac2 (patch) | |
| tree | de5c404187681bf35d7a92e917c54a69e902df91 /mediagoblin/db/models.py | |
| parent | a48014d67a5185c645ac876d365b4cb85cbb6b1f (diff) | |
| parent | 0e9dd2a28669a4d42c4a3828dbd047937acd776c (diff) | |
| download | mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.lz mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.tar.xz mediagoblin-9e883ed3b223311e3325e41e75dec7ee82875ac2.zip | |
Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
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 0b092d60..e034cc29 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 @@ -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: |