aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit/views.py
diff options
context:
space:
mode:
authorxray7224 <xray7224@googlemail.com>2013-07-14 15:27:52 +0100
committerxray7224 <xray7224@googlemail.com>2013-07-14 15:27:52 +0100
commite49263564b0ee8859c43e2716fcedab6e80bf164 (patch)
tree37411b19738484cbba814e584b8d3547d3a2ded0 /mediagoblin/edit/views.py
parent49a47ec991152a5dd25a7460e1d3d11afb73d32d (diff)
parent2d0028e93283fea397133294a5eb45b67d5ed0ab (diff)
downloadmediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.lz
mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.tar.xz
mediagoblin-e49263564b0ee8859c43e2716fcedab6e80bf164.zip
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/edit/views.py')
-rw-r--r--mediagoblin/edit/views.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 7a8d6185..6aa2acd9 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -305,9 +305,9 @@ def edit_collection(request, collection):
form.slug.data, collection.id)
# Make sure there isn't already a Collection with this title
- existing_collection = request.db.Collection.find_one({
- 'creator': request.user.id,
- 'title':form.title.data})
+ existing_collection = request.db.Collection.query.filter_by(
+ creator=request.user.id,
+ title=form.title.data).first()
if existing_collection and existing_collection.id != collection.id:
messages.add_message(