Merge pull request #3041 from alphagov/delete-letter-contact

Let users delete letter contact blocks
This commit is contained in:
Chris Hill-Scott
2019-07-24 10:47:48 +01:00
committed by GitHub
9 changed files with 228 additions and 48 deletions

View File

@@ -213,8 +213,14 @@
{% call settings_row(if_has_permission='letter') %}
{{ text_field('Sender addresses') }}
{% call field(status='default' if current_service.default_letter_contact_block == None else '') %}
{{ current_service.default_letter_contact_block | string | nl2br | safe if current_service.default_letter_contact_block else 'Not set'}}
{% call field(status='' if current_service.count_letter_contact_details else 'default') %}
{% if current_service.default_letter_contact_block %}
{{ current_service.default_letter_contact_block_html }}
{% elif current_service.count_letter_contact_details %}
Blank
{% else %}
Not set
{% endif %}
{% if current_service.count_letter_contact_details > 1 %}
<div class="hint">
{{ '…and %d more' | format(current_service.count_letter_contact_details - 1) }}

View File

@@ -17,11 +17,18 @@
) }}
</div>
<div class="user-list">
{% if not letter_contact_details %}
<div class="user-list-item">
<span class="hint">You havent added any letter contact details yet</span>
</div>
{% endif %}
<div class="user-list-item">
<span class="hint">
Blank
{% if current_service.default_letter_contact_block %}
{% if current_user.has_permissions('manage_service') %}
<a class="user-list-edit-link" href="{{ url_for('.service_make_blank_default_letter_contact', service_id =current_service.id) }}">Make default</a>
{% endif %}
{% else %}
(default)
{% endif %}
</span>
</div>
{% for item in letter_contact_details %}
<div class="user-list-item">
<p>

View File

@@ -24,16 +24,24 @@
rows=10,
highlight_tags=True
) }}
{% if form.is_default.data %}
<p class="form-group">
This is currently your default address for {{ current_service.name }}
This is the default address for {{ current_service.name }}
</p>
{% else %}
<div class="form-group">
{{ checkbox(form.is_default) }}
</div>
{% endif %}
{{ page_footer('Save') }}
{{ page_footer(
'Save',
delete_link=url_for('.service_confirm_delete_letter_contact', service_id=current_service.id, letter_contact_id=letter_contact_id),
delete_link_text='Delete'
) }}
{% endcall %}
{% endblock %}