From fc60016566ad8402c5ff57b2671ea5c33f2388ca Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 21 Oct 2016 09:40:56 +0100 Subject: [PATCH] =?UTF-8?q?Remove=20=E2=80=98all=20services=E2=80=99=20pag?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s not needed any more, because the platform admin page does the same thing better. --- app/main/__init__.py | 1 - app/main/views/all_services.py | 15 --------------- tests/app/main/views/test_dashboard.py | 3 --- 3 files changed, 19 deletions(-) delete mode 100644 app/main/views/all_services.py diff --git a/app/main/__init__.py b/app/main/__init__.py index b32a6411f..b70ccb942 100644 --- a/app/main/__init__.py +++ b/app/main/__init__.py @@ -24,7 +24,6 @@ from app.main.views import ( api_keys, manage_users, invites, - all_services, feedback, providers, platform_admin diff --git a/app/main/views/all_services.py b/app/main/views/all_services.py deleted file mode 100644 index cb1cc8b28..000000000 --- a/app/main/views/all_services.py +++ /dev/null @@ -1,15 +0,0 @@ -from flask import render_template -from flask_login import login_required - -from app import service_api_client -from app.main import main -from app.utils import user_has_permissions -from app.notify_client.service_api_client import ServicesBrowsableItem - - -@main.route("/all-services") -@login_required -@user_has_permissions(None, admin_override=True) -def show_all_services(): - services = [ServicesBrowsableItem(x) for x in service_api_client.get_services()['data']] - return render_template('views/all-services.html', services=services) diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index 759777938..09a243e8c 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -338,7 +338,6 @@ def test_menu_send_messages(mocker, 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 - assert url_for('main.show_all_services') not in page assert url_for('main.view_providers') not in page @@ -371,7 +370,6 @@ def test_menu_manage_service(mocker, assert url_for('main.service_settings', service_id=service_one['id']) 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 def test_menu_manage_api_keys(mocker, @@ -401,7 +399,6 @@ def test_menu_manage_api_keys(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']) not in page - assert url_for('main.show_all_services') not in page assert url_for('main.api_integration', service_id=service_one['id']) in page