aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/edit/views.py
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-07-16 06:48:33 +0530
committerAditi <aditi.iitr@gmail.com>2013-07-16 06:48:33 +0530
commit67d303ffa96a80da3a3cf48d2f9231bc1a087a19 (patch)
tree8bd1af9ec13fed7c340a6329632bddf2d17e3fb6 /mediagoblin/edit/views.py
parent7b77f7e490a27de57a4dab5301662ef95d11b213 (diff)
parent64ad0beea83b1f4b50462bcb67c54156fc9365a5 (diff)
downloadmediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.lz
mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.tar.xz
mediagoblin-67d303ffa96a80da3a3cf48d2f9231bc1a087a19.zip
merge with remote master branch of cweb.
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(