mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-05 23:58:25 -04:00
Merge pull request #3307 from alphagov/send-by-email-setting
Users now able to set the send by email setting by themselves
This commit is contained in:
@@ -67,7 +67,6 @@ from app.utils import (
|
||||
PLATFORM_ADMIN_SERVICE_PERMISSIONS = OrderedDict([
|
||||
('inbound_sms', {'title': 'Receive inbound SMS', 'requires': 'sms', 'endpoint': '.service_set_inbound_number'}),
|
||||
('email_auth', {'title': 'Email authentication'}),
|
||||
('upload_document', {'title': 'Send files by email', 'endpoint': '.service_switch_can_upload_document'}),
|
||||
('upload_letters', {'title': 'Uploading letters', 'requires': 'letter'}),
|
||||
])
|
||||
|
||||
@@ -294,26 +293,6 @@ def service_set_permission(service_id, permission):
|
||||
)
|
||||
|
||||
|
||||
@main.route("/services/<uuid:service_id>/service-settings/can-upload-document", methods=['GET', 'POST'])
|
||||
@user_is_platform_admin
|
||||
def service_switch_can_upload_document(service_id):
|
||||
if current_service.contact_link:
|
||||
return redirect(url_for('.service_set_permission', service_id=service_id, permission='upload_document'))
|
||||
|
||||
form = ServiceContactDetailsForm()
|
||||
|
||||
if form.validate_on_submit():
|
||||
contact_type = form.contact_details_type.data
|
||||
|
||||
current_service.update(
|
||||
contact_link=form.data[contact_type]
|
||||
)
|
||||
|
||||
return redirect(url_for('.service_set_permission', service_id=service_id, permission='upload_document'))
|
||||
|
||||
return render_template('views/service-settings/contact_link.html', form=form)
|
||||
|
||||
|
||||
@main.route("/services/<uuid:service_id>/service-settings/archive", methods=['GET', 'POST'])
|
||||
@user_has_permissions('manage_service')
|
||||
def archive_service(service_id):
|
||||
@@ -359,18 +338,20 @@ def resume_service(service_id):
|
||||
return service_settings(service_id)
|
||||
|
||||
|
||||
@main.route("/services/<uuid:service_id>/service-settings/contact-link", methods=['GET', 'POST'])
|
||||
@main.route("/services/<uuid:service_id>/service-settings/send-files-by-email", methods=['GET', 'POST'])
|
||||
@user_has_permissions('manage_service')
|
||||
def service_set_contact_link(service_id):
|
||||
def send_files_by_email_contact_details(service_id):
|
||||
form = ServiceContactDetailsForm()
|
||||
contact_details = None
|
||||
|
||||
if request.method == 'GET':
|
||||
contact_details = current_service.contact_link
|
||||
contact_type = check_contact_details_type(contact_details)
|
||||
field_to_update = getattr(form, contact_type)
|
||||
if contact_details:
|
||||
contact_type = check_contact_details_type(contact_details)
|
||||
field_to_update = getattr(form, contact_type)
|
||||
|
||||
form.contact_details_type.data = contact_type
|
||||
field_to_update.data = contact_details
|
||||
form.contact_details_type.data = contact_type
|
||||
field_to_update.data = contact_details
|
||||
|
||||
if form.validate_on_submit():
|
||||
contact_type = form.contact_details_type.data
|
||||
@@ -380,7 +361,9 @@ def service_set_contact_link(service_id):
|
||||
)
|
||||
return redirect(url_for('.service_settings', service_id=current_service.id))
|
||||
|
||||
return render_template('views/service-settings/contact_link.html', form=form)
|
||||
return render_template(
|
||||
'views/service-settings/send-files-by-email.html', form=form, contact_details=contact_details
|
||||
)
|
||||
|
||||
|
||||
@main.route("/services/<uuid:service_id>/service-settings/set-reply-to-email", methods=['GET'])
|
||||
|
||||
Reference in New Issue
Block a user