Go to organisation stub page which will eventually show list of services

This commit is contained in:
Ken Tsang
2018-02-08 16:18:18 +00:00
parent d4c6491c93
commit a200f1a17e
4 changed files with 58 additions and 3 deletions

View File

@@ -19,6 +19,18 @@ def organisations():
)
@main.route("/organisation/<org_id>", methods=['GET'])
@login_required
@user_has_permissions(admin_override=True)
def view_organisation(org_id):
org = organisations_client.get_organisation(org_id)
return render_template(
'views/organisations/view-organisation.html',
organisation=org
)
@main.route("/organisation/<org_id>/edit", methods=['GET', 'POST'])
@login_required
@user_has_permissions(admin_override=True)

View File

@@ -18,7 +18,7 @@
<div class="column-three-quarters">
{% for org in organisations %}
<div>
<a href="{{ url_for('main.update_organisation', org_id=org['id']) }}" class="browse-list-link">{{ org['name'] }}</a>
<a href="{{ url_for('main.view_organisation', org_id=org['id']) }}" class="browse-list-link">{{ org['name'] }}</a>
{% if not org['active'] %}
<span class="table-field-status-default heading-medium">- archived</span>
{% endif %}

View File

@@ -0,0 +1,23 @@
{% extends "views/platform-admin/_base_template.html" %}
{% from "components/page-footer.html" import page_footer %}
{% block per_page_title %}
{{ organisation['name'] }}
{% endblock %}
{% block service_page_title %}
{{ organisation['name'] }}
{% endblock %}
{% block platform_admin_content %}
<h1 class="heading-large">
<div>{{ organisation['name'] }}</div>
</h1>
<div class="grid-row">
<div class="column-three-quarters">
[List of services]
</div>
</div>
{% endblock %}

View File

@@ -31,12 +31,32 @@ def test_organisation_page_shows_all_organisations(
) == "Organisations"
for index, org in enumerate(orgs):
assert (page.select('a.browse-list-link')[index]).text == org['name']
assert page.select('a.browse-list-link')[index].text == org['name']
if not org['active']:
assert (page.select_one('.table-field-status-default,heading-medium')).text == '- archived'
assert page.select_one('.table-field-status-default,heading-medium').text == '- archived'
assert normalize_spaces((page.select('a.browse-list-link')[-1]).text) == 'Create an organisation'
def test_view_organisation_shows_the_correct_organisation(
logged_in_platform_admin_client,
fake_uuid,
mocker
):
org = {'id': fake_uuid, 'name': 'Test 1', 'active': True}
mocker.patch(
'app.organisations_client.get_organisation', return_value=org
)
response = logged_in_platform_admin_client.get(
url_for('.view_organisation', org_id=fake_uuid)
)
assert response.status_code == 200
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
assert page.select_one('.heading-large div').text == org['name']
def test_edit_organisation_shows_the_correct_organisation(
logged_in_platform_admin_client,
fake_uuid,