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

Remove add template as separate page

Browse Source 
This has moved to the choose template page.
This commit is contained in:
Chris Hill-Scott
2019-02-11 16:09:08 +00:00
parent 3a5bfeb7aa
commit 7d7b790dc1
7 changed files with 17 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/main/forms.py
View File

@@ -938,28 +938,6 @@ class DateFilterForm(StripWhitespaceForm):
include_from_test_key = BooleanField("Include test keys", default="checked", false_values={"N"})
class ChooseTemplateType(StripWhitespaceForm):
template_type = RadioField(
'',
validators=[
DataRequired()
]
)
def __init__(self, include_letters=False, include_copy=False, *args, **kwargs):
super().__init__(*args, **kwargs)
self.template_type.choices = filter(None, [
('email', 'Email template'),
('sms', 'Text message template'),
('letter', 'Letter template') if include_letters else None,
('copy-existing', 'Copy of an existing template') if include_copy else None,
('folder', 'Folder'),
])
class SearchByNameForm(StripWhitespaceForm):
search = SearchField('Search by name')

20
app/main/views/templates.py
View File

@@ -18,7 +18,6 @@ from app import (
)
from app.main import main
from app.main.forms import (
ChooseTemplateType,
EmailTemplateForm,
LetterTemplateForm,
LetterTemplatePostageForm,
@@ -252,25 +251,6 @@ def view_template_version_preview(service_id, template_id, version, filetype):
return TemplatePreview.from_database_object(db_template, filetype)
@main.route("/services/<service_id>/templates/add", methods=['GET', 'POST'])
@main.route("/services/<service_id>/templates/folders/<template_folder_id>/add", methods=['GET', 'POST'])
@login_required
@user_has_permissions('manage_templates')
def add_template_by_type(service_id, template_folder_id=None):
form = ChooseTemplateType(
include_letters=current_service.has_permission('letter'),
include_copy=(
current_service.all_templates or len(user_api_client.get_service_ids_for_user(current_user)) > 1
),
)
if form.validate_on_submit():
return _add_template_by_type(form.template_type.data, template_folder_id)
return render_template('views/templates/add.html', form=form)
def _add_template_by_type(template_type, template_folder_id):
if template_type == 'copy-existing':