diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-03-06 00:36:15 +0100 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-03-06 00:36:15 +0100 |
| commit | 3d541b04a9c5fe5729ce1b4386a2964b2730484d (patch) | |
| tree | 8bbb87bef4e4ff3df35f2bc492f038328fed459e /mediagoblin/edit/views.py | |
| parent | b01a3b938666569cc021698ce854fb534e4d85e3 (diff) | |
| parent | b62b3b982a2543fb881c93570c544fbef61dd97e (diff) | |
| download | mediagoblin-3d541b04a9c5fe5729ce1b4386a2964b2730484d.tar.lz mediagoblin-3d541b04a9c5fe5729ce1b4386a2964b2730484d.tar.xz mediagoblin-3d541b04a9c5fe5729ce1b4386a2964b2730484d.zip | |
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/edit/views.py')
| -rw-r--r-- | mediagoblin/edit/views.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py index d21ef03a..2df8f9ab 100644 --- a/mediagoblin/edit/views.py +++ b/mediagoblin/edit/views.py @@ -36,6 +36,7 @@ from mediagoblin.tools.text import ( clean_html, convert_to_tag_list_of_dicts, media_tags_as_string) from mediagoblin.tools.licenses import SUPPORTED_LICENSES +from mediagoblin.db.util import check_media_slug_used @get_user_media_entry @@ -58,12 +59,10 @@ def edit_media(request, media): if request.method == 'POST' and form.validate(): # Make sure there isn't already a MediaEntry with such a slug # and userid. - existing_user_slug_entries = request.db.MediaEntry.find( - {'slug': request.POST['slug'], - 'uploader': media.uploader, - '_id': {'$ne': media._id}}).count() + slug_used = check_media_slug_used(request.db, media.uploader, + request.POST['slug'], media.id) - if existing_user_slug_entries: + if slug_used: form.slug.errors.append( _(u'An entry with that slug already exists for this user.')) else: |