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

Sort services and orgs in presentation layer

Browse Source 
The model layer shouldn’t need to be concerned with sorting. For
services this means we can make a `SerialisedModelCollection` rather
than writing a manual loop.
This commit is contained in:
Chris Hill-Scott
2021-09-27 15:20:56 +01:00
parent 4d4c9c0db2
commit 9281ca7d50
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/user.py
View File

@@ -293,9 +293,9 @@ class User(JSONModel, UserMixin):
@property @property
def services(self): def services(self):
from app.models.service import Service from app.models.service import Service
return sorted( return [
Service(service) for service in self.orgs_and_services['services'] Service(service) for service in self.orgs_and_services['services']
) ]
@property @property
def services_with_organisation(self): def services_with_organisation(self):

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

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