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

Merge branch 'master' into testing-doc

Browse Source
This commit is contained in:
Rebecca Law
2017-01-31 16:36:03 +00:00
parent dc9524f01e 7cf436a9c8
commit 7f31bd7548
13 changed files with 26 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/main/views/send.py
View File

@@ -369,7 +369,6 @@ def recheck_messages(service_id, template_type, upload_id):
@login_required
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
def start_job(service_id, upload_id):
upload_data = session['upload_data']
if request.files or not upload_data.get('valid'):
@@ -378,14 +377,6 @@ def start_job(service_id, upload_id):
session.pop('upload_data')
template = service_api_client.get_service_template(
service_id,
upload_data.get('template_id')
)['data']
if template['template_type'] == 'letter':
abort(403)
job_api_client.create_job(
upload_id,
service_id,

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

@@ -186,12 +186,12 @@ def service_switch_can_send_letters(service_id):
return redirect(url_for('.service_settings', service_id=service_id))
@main.route("/services/<service_id>/service-settings/deactivate", methods=['GET', 'POST'])
@main.route("/services/<service_id>/service-settings/archive", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_settings', admin_override=True)
def deactivate_service(service_id):
def archive_service(service_id):
if request.method == 'POST':
service_api_client.deactivate_service(service_id)
service_api_client.archive_service(service_id)
return redirect(url_for('.service_settings', service_id=service_id))
else:
flash('There\'s no way to reverse this! Are you sure you want to archive this service?', 'delete')