Fix /accounts page to only show trial services once

The `/accounts` page was listing trial mode services twice if a user
belonged to an org. They were shown under both the 'Live services' and
'Trial mode services' sections. After this change, 'Live services' will
show all live services (whether or not they belong to an org) and 'Trial
mode services' will show all trial mode services. If a user belongs to an
org, they will also see the summary of how many services per org at the
top of the page.

A couple of services in tests were renamed for clarity.
This commit is contained in:
Katie Smith
2021-03-16 15:34:35 +00:00
parent 01c651d224
commit a33b6e0a0d
3 changed files with 14 additions and 8 deletions

View File

@@ -79,7 +79,7 @@
heading='Live services',
show_heading=current_user.trial_mode_services,
organisations=current_user.organisations,
services=current_user.live_services_not_belonging_to_users_organisations
services=current_user.live_services
) }}
{% else %}
{{ service_list(