darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-08 01:28:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4034 from alphagov/refactor-services-models

Browse Source 
Refactor services and organisations models for users
This commit is contained in:
Chris Hill-Scott
2021-11-15 11:21:43 +00:00
committed by GitHub
parent ccebae6c75 0c2b586e40
commit 47797cf686
11 changed files with 74 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/templates/views/choose-account.html
View File

@@ -19,7 +19,7 @@
{% else %}
<ul>
{% endif %}
{% for org in organisations %}
{% for org in organisations|sort %}
<li class="browse-list-item">
<a href="{{ url_for('.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
<p class="browse-list-hint">
@@ -28,7 +28,7 @@
</p>
</li>
{% endfor %}
{% for service in services %}
{% for service in services|sort %}
<li class="browse-list-item">
<a href="{{ url_for('.service_dashboard', service_id=service.id) }}" class="govuk-link govuk-link--no-visited-state">{{ service.name }}</a>
</li>

4
app/templates/views/find-users/user-information.html
View File

@@ -17,7 +17,7 @@
<nav class="browse-list">
{% if user.live_services %}
<ul>
{% for service in user.live_services %}
{% for service in user.live_services|sort %}
<li class="browse-list-item">
<a class="govuk-link govuk-link--no-visited-state browse-list-hint" href={{url_for('.service_dashboard', service_id=service.id)}}>{{ service.name }}</a>
</li>
@@ -33,7 +33,7 @@
<nav class="browse-list">
{% if user.trial_mode_services %}
<ul>
{% for service in user.trial_mode_services %}
{% for service in user.trial_mode_services|sort %}
<li class="browse-list-item">
<a class="govuk-link govuk-link--no-visited-state browse-list-hint" href={{url_for('.service_dashboard', service_id=service.id)}}>{{ service.name }}</a>
</li>

2
app/templates/views/organisations/index.html
View File

@@ -14,7 +14,7 @@
<nav class="browse-list">
<ul>
{% for org in organisations %}
{% for org in organisations|sort %}
<li class="browse-list-item">
<a href="{{ url_for('main.organisation_dashboard', org_id=org.id) }}" class="govuk-link govuk-link--no-visited-state">{{ org.name }}</a>
{% if not org.active %}