diff --git a/blazar_dashboard/content/leases/tabs.py b/blazar_dashboard/content/leases/tabs.py index 07cae8d..9c6e728 100644 --- a/blazar_dashboard/content/leases/tabs.py +++ b/blazar_dashboard/content/leases/tabs.py @@ -20,6 +20,18 @@ from horizon import tabs from blazar_dashboard.api import client +RESERVATION_GENERALS = ( + 'id', + 'lease_id', + 'resource_id', + 'resource_type', + 'status', + 'missing_resources', + 'resources_changed', + 'created_at', + 'updated_at' +) + class OverviewTab(tabs.Tab): name = _("Overview") @@ -35,7 +47,8 @@ class OverviewTab(tabs.Tab): msg = _('Unable to retrieve lease details.') exceptions.handle(request, msg, redirect=redirect) - return {'lease': lease} + return {'lease': lease, + 'reservation_generals': RESERVATION_GENERALS} class LeaseDetailTabs(tabs.TabGroup): diff --git a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html index bc91f41..6214b67 100644 --- a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html +++ b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html @@ -18,7 +18,7 @@
{% trans "Status" %}
{{ lease.status|default:"-" }}
{% trans "Degraded" %}
-
{{ lease.degraded|yesno|capfirst }}
+
{{ lease.degraded|yesno|capfirst|default:"-" }}
@@ -45,13 +45,24 @@ {% for reservation in lease.reservations %}
+
{% trans "id" %}
+
{{ reservation.id|default:"-" }}
+
{% trans "status" %}
+
{{ reservation.status|default:"-" }}
+
{% trans "resource type" %}
+
{{ reservation.resource_type|default:"-" }}
+
{% trans "missing resources" %}
+
{{ reservation.missing_resources|yesno|capfirst|default:"-" }}
+
{% trans "resources changed" %}
+
{{ reservation.resources_changed|yesno|capfirst|default:"-" }}
{% for key, value in reservation.items %} - {% if 'ted_at' in key %} + {% if key not in reservation_generals %}
{{ key }}
-
{{ value|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}
- {% else %} -
{{ key }}
-
{{ value }}
+ {% if value is True or value is False %} +
{{ value|yesno|capfirst|default:"-" }}
+ {% else %} +
{{ value|default:"-" }}
+ {% endif %} {% endif %} {% endfor %}