diff --git a/app/main/views/send.py b/app/main/views/send.py index edf8244f6..757903086 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -193,13 +193,9 @@ def send_from_api(service_id, template_id): service_api_client.get_service_template(service_id, template_id)['data'], prefix=current_service['name'] ) - personalisation = { - placeholder: "..." for placeholder in template.placeholders - } return render_template( 'views/send-from-api.html', - template=template, - personalisation=json.dumps(personalisation, indent=4) if personalisation else None + template=template ) diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 02564240d..aa57f52d5 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -92,16 +92,24 @@

Help

-

Documentation

+

API documentation

diff --git a/app/templates/views/api-keys.html b/app/templates/views/api-keys.html index 78ba560ed..22d3cc12d 100644 --- a/app/templates/views/api-keys.html +++ b/app/templates/views/api-keys.html @@ -58,11 +58,19 @@ {{ api_key(current_service.id, "Service ID", thing="service ID") }} -

Documentation

-

- See the - - API documentation for clients and specfications. -

+

API clients

+ {% endblock %} diff --git a/app/templates/views/send-from-api.html b/app/templates/views/send-from-api.html index 9add19598..266bdb088 100644 --- a/app/templates/views/send-from-api.html +++ b/app/templates/views/send-from-api.html @@ -32,13 +32,4 @@ {{ api_key(template.id, name="Template ID", thing='template ID') }} - {% if personalisation %} -

Personalisation (all fields are required)

- {{ personalisation|syntax_highlight_json }} - {% endif %} - -

-
See the developer documentation for full details. -

- {% endblock %} diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index b1cc51ccb..1be535cbd 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -277,7 +277,6 @@ def test_menu_send_messages(mocker, service_id=service_one['id'], template_type='sms')in page assert url_for('main.manage_users', service_id=service_one['id']) in page - assert url_for('main.documentation') in page assert url_for('main.service_settings', service_id=service_one['id']) not in page assert url_for('main.api_keys', service_id=service_one['id']) not in page @@ -312,7 +311,6 @@ def test_menu_manage_service(mocker, template_type='sms') in page assert url_for('main.manage_users', service_id=service_one['id']) in page assert url_for('main.service_settings', service_id=service_one['id']) in page - assert url_for('main.documentation') in page assert url_for('main.api_keys', service_id=service_one['id']) not in page assert url_for('main.show_all_services') not in page diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 66fd846b1..a7aed4e44 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -251,7 +251,7 @@ def test_api_info_page( follow_redirects=True ) assert response.status_code == 200 - assert 'API integration' in response.get_data(as_text=True) + assert 'API info' in response.get_data(as_text=True) def test_download_example_csv(