diff options
| -rw-r--r-- | mediagoblin/submit/views.py | 13 | ||||
| -rw-r--r-- | mediagoblin/user_pages/views.py | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mediagoblin/submit/views.py b/mediagoblin/submit/views.py index 9d31c844..c9735fd3 100644 --- a/mediagoblin/submit/views.py +++ b/mediagoblin/submit/views.py @@ -114,6 +114,7 @@ def submit_start(request): {'submit_form': submit_form, 'app_config': mg_globals.app_config}) + @require_active_login def add_collection(request, media=None): """ @@ -122,7 +123,6 @@ def add_collection(request, media=None): submit_form = submit_forms.AddCollectionForm(request.form) if request.method == 'POST' and submit_form.validate(): - try: collection = request.db.Collection() collection.title = unicode(submit_form.title.data) @@ -136,19 +136,18 @@ def add_collection(request, media=None): 'title':collection.title}) if existing_collection: - messages.add_message( - request, messages.ERROR, _('You already have a collection called "%s"!' % collection.title)) + add_message(request, messages.ERROR, + _('You already have a collection called "%s"!') \ + % collection.title) else: collection.save() - add_message(request, SUCCESS, _('Collection "%s" added!' % collection.title)) + add_message(request, SUCCESS, + _('Collection "%s" added!') % collection.title) return redirect(request, "mediagoblin.user_pages.user_home", user=request.user.username) - except Exception as e: - raise - return render_to_response( request, 'mediagoblin/submit/collection.html', diff --git a/mediagoblin/user_pages/views.py b/mediagoblin/user_pages/views.py index e3b46c0f..21b0c016 100644 --- a/mediagoblin/user_pages/views.py +++ b/mediagoblin/user_pages/views.py @@ -409,8 +409,8 @@ def collection_confirm_delete(request, collection): item.delete() collection.delete() - messages.add_message( - request, messages.SUCCESS, _('You deleted the collection "%s"' % collection_title)) + messages.add_message(request, messages.SUCCESS, + _('You deleted the collection "%s"') % collection_title) return redirect(request, "mediagoblin.user_pages.user_home", user=username) |