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

Simplify check_media_slug_used

Browse Source 
Remove the unused dummy_db argument and generally make the function
readable.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2013-01-09 11:31:05 +01:00
parent 4fc0a28994
commit 65969d3fb7
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/db/mixin.py
View File

@ -58,8 +58,7 @@ class MediaEntryMixin(object):
self.slug = slugify(self.title) self.slug = slugify(self.title)
duplicate = check_media_slug_used(mg_globals.database, duplicate = check_media_slug_used(self.uploader, self.slug, self.id)
self.uploader, self.slug, self.id)
if duplicate: if duplicate:
if self.id is not None: if self.id is not None:

9
mediagoblin/db/util.py
View File

@ -29,12 +29,11 @@ def atomic_update(table, query_dict, update_values):
Session.commit() Session.commit()
def check_media_slug_used(dummy_db, uploader_id, slug, ignore_m_id): def check_media_slug_used(uploader_id, slug, ignore_m_id):
filt = (MediaEntry.uploader == uploader_id) \ query = MediaEntry.query.filter_by(uploader=uploader_id, slug=slug)
& (MediaEntry.slug == slug)
if ignore_m_id is not None: if ignore_m_id is not None:
filt = filt & (MediaEntry.id != ignore_m_id) query = query.filter(MediaEntry.id != ignore_m_id)
does_exist = Session.query(MediaEntry.id).filter(filt).first() is not None does_exist = query.first() is not None
return does_exist return does_exist

4
mediagoblin/edit/views.py
View File

@ -57,8 +57,8 @@ def edit_media(request, media):
if request.method == 'POST' and form.validate(): if request.method == 'POST' and form.validate():
# Make sure there isn't already a MediaEntry with such a slug # Make sure there isn't already a MediaEntry with such a slug
# and userid. # and userid.
slug_used = check_media_slug_used(request.db, media.uploader, slug_used = check_media_slug_used(media.uploader, request.form['slug'],
request.form['slug'], media.id) media.id)
if slug_used: if slug_used:
form.slug.errors.append( form.slug.errors.append(