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

show archived label on platform admin page, and sort last

Browse Source
This commit is contained in:
Leo Hemsted
2016-11-04 16:27:27 +00:00
parent 7a48e25dbb
commit defa93809a
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/main/views/platform_admin.py
View File

@@ -20,7 +20,7 @@ def platform_admin():
'views/platform-admin.html',
**get_statistics(sorted(
services,
key=lambda service: service['created_at'],
key=lambda service: (service['active'], service['created_at']),
reverse=True
))
)
@@ -29,12 +29,12 @@ def platform_admin():
def get_statistics(services):
return {
'global_stats': create_global_stats(services),
'live_services': format_stats_by_service([
'live_services': format_stats_by_service(
service for service in services if not service['restricted']
]),
'trial_mode_services': format_stats_by_service([
),
'trial_mode_services': format_stats_by_service(
service for service in services if service['restricted']
]),
),
}
@@ -72,5 +72,6 @@ def format_stats_by_service(services):
'failed': sum(stat['failed'] for stat in stats),
'restricted': service['restricted'],
'research_mode': service['research_mode'],
'created_at': service['created_at']
'created_at': service['created_at'],
'active': service['active']
}

6
app/templates/views/platform-admin.html
View File

@@ -23,7 +23,11 @@
<a href="{{ url_for('main.service_dashboard', service_id=item['id']) }}" class="browse-list-link">{{ item['name'] }}</a>
</div>
{% endcall %}
{% if item['research_mode'] %}
{% if not item['active'] %}
{% call field(status='default') %}
<span class="heading-medium">archived</span>
{% endcall %}
{% elif item['research_mode'] %}
{% call field() %}
<span class="research-mode">research mode</span>
{% endcall %}