darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 07:46:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactored register_errorhandlers so that it handles HTTPError

Browse Source 
Remove most cases where we catch HTTPError
This commit is contained in:
Rebecca Law
2016-03-10 11:53:29 +00:00
parent 2acc496734
commit f6d98b63ea
14 changed files with 110 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
app/main/views/service_settings.py
View File

@@ -13,8 +13,6 @@ from flask_login import (
current_user
)
from notifications_python_client.errors import HTTPError
from app.main.dao.services_dao import (
get_service_by_id,
delete_service,
@@ -31,13 +29,8 @@ from app.main.forms import ConfirmPasswordForm, ServiceNameForm
@login_required
@user_has_permissions('manage_settings')
def service_settings(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
return render_template(
'views/service-settings.html',
service=service,
@@ -49,13 +42,7 @@ def service_settings(service_id):
@login_required
@user_has_permissions('manage_settings')
def service_name_change(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
form = ServiceNameForm()
@@ -74,13 +61,7 @@ def service_name_change(service_id):
@login_required
@user_has_permissions('manage_settings')
def service_name_change_confirm(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
# Validate password for form
def _check_password(pwd):
@@ -104,13 +85,7 @@ def service_name_change_confirm(service_id):
@login_required
@user_has_permissions('manage_settings')
def service_request_to_go_live(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
if request.method == 'GET':
return render_template(
'views/service-settings/request-to-go-live.html',
@@ -127,13 +102,7 @@ def service_request_to_go_live(service_id):
@login_required
@user_has_permissions('manage_settings')
def service_status_change(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
if request.method == 'GET':
return render_template(
@@ -149,13 +118,7 @@ def service_status_change(service_id):
@login_required
@user_has_permissions('manage_settings')
def service_status_change_confirm(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
# Validate password for form
def _check_password(pwd):
@@ -178,13 +141,7 @@ def service_status_change_confirm(service_id):
@login_required
@user_has_permissions('manage_settings')
def service_delete(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
if request.method == 'GET':
return render_template(
@@ -200,13 +157,7 @@ def service_delete(service_id):
@login_required
@user_has_permissions('manage_settings')
def service_delete_confirm(service_id):
try:
service = get_service_by_id(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = get_service_by_id(service_id)['data']
# Validate password for form
def _check_password(pwd):
@@ -214,13 +165,7 @@ def service_delete_confirm(service_id):
form = ConfirmPasswordForm(_check_password)
if form.validate_on_submit():
try:
service = delete_service(service_id)
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
service = delete_service(service_id)
return redirect(url_for('.choose_service'))
return render_template(