From f3ff7ee84d33ddf5f376589fe414785eb2327fee Mon Sep 17 00:00:00 2001 From: Katie Smith Date: Thu, 20 Jun 2019 16:58:53 +0100 Subject: [PATCH] Don't show org breadcrumbs for trial mode services Platform admin users can still see the organisation breadcrumbs for trial mode services, but others uses can only see organisation breadcrumbs for live services. --- app/templates/withnav_template.html | 3 ++- tests/app/main/views/test_dashboard.py | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/templates/withnav_template.html b/app/templates/withnav_template.html index a67546394..235d779f2 100644 --- a/app/templates/withnav_template.html +++ b/app/templates/withnav_template.html @@ -9,7 +9,8 @@
{% if current_service.organisation_id %} - {% if current_user.platform_admin or current_user.belongs_to_organisation(current_service.organisation_id) %} + {% if current_user.platform_admin or + (current_user.belongs_to_organisation(current_service.organisation_id) and current_service.live) %} {{ current_service.organisation.name }} {% endif %} diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py index b1035dc21..6b3b4b649 100644 --- a/tests/app/main/views/test_dashboard.py +++ b/tests/app/main/views/test_dashboard.py @@ -1362,6 +1362,7 @@ def test_org_breadcrumbs_do_not_show_if_user_is_not_an_org_member( service_one_json = service_json(SERVICE_ONE_ID, users=[active_caseworking_user['id']], + restricted=False, organisation_id=ORGANISATION_ID) mocker.patch('app.service_api_client.get_service', return_value={'data': service_one_json}) @@ -1383,6 +1384,7 @@ def test_org_breadcrumbs_show_if_user_is_a_member_of_the_services_org( service_one_json = service_json(SERVICE_ONE_ID, users=[active_user_with_permissions['id']], + restricted=False, organisation_id=ORGANISATION_ID) mocker.patch('app.service_api_client.get_service', return_value={'data': service_one_json}) @@ -1393,6 +1395,28 @@ def test_org_breadcrumbs_show_if_user_is_a_member_of_the_services_org( assert page.select('.navigation-breadcrumb') +def test_org_breadcrumbs_do_not_show_if_user_is_a_member_of_the_services_org_but_service_is_in_trial_mode( + mocker, + mock_get_template_statistics, + mock_get_service_templates_when_no_templates_exist, + mock_get_jobs, + active_user_with_permissions, + client_request, +): + # active_user_with_permissions (used by the client_request) is an org member + + service_one_json = service_json(SERVICE_ONE_ID, + users=[active_user_with_permissions['id']], + organisation_id=ORGANISATION_ID) + + mocker.patch('app.service_api_client.get_service', return_value={'data': service_one_json}) + mocker.patch('app.models.service.Organisation') + + page = client_request.get('main.service_dashboard', service_id=SERVICE_ONE_ID) + + assert not page.select('.navigation-breadcrumb') + + def test_org_breadcrumbs_show_if_user_is_platform_admin( mocker, mock_get_template_statistics,