Sort reservation parameters
This patch changes the reservation view in the detailed view of a lease. General reservation parameters are shown first and resource specific parameters are shown after them. Change-Id: I6b3d91370c26332bba5452a28be3020653fd11fd Closes-Bug: #1711554
This commit is contained in:
parent
33e190a837
commit
607f3bdc1c
@ -20,6 +20,18 @@ from horizon import tabs
|
|||||||
|
|
||||||
from blazar_dashboard.api import client
|
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):
|
class OverviewTab(tabs.Tab):
|
||||||
name = _("Overview")
|
name = _("Overview")
|
||||||
@ -35,7 +47,8 @@ class OverviewTab(tabs.Tab):
|
|||||||
msg = _('Unable to retrieve lease details.')
|
msg = _('Unable to retrieve lease details.')
|
||||||
exceptions.handle(request, msg, redirect=redirect)
|
exceptions.handle(request, msg, redirect=redirect)
|
||||||
|
|
||||||
return {'lease': lease}
|
return {'lease': lease,
|
||||||
|
'reservation_generals': RESERVATION_GENERALS}
|
||||||
|
|
||||||
|
|
||||||
class LeaseDetailTabs(tabs.TabGroup):
|
class LeaseDetailTabs(tabs.TabGroup):
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
<dt>{% trans "Status" %}</dt>
|
<dt>{% trans "Status" %}</dt>
|
||||||
<dd>{{ lease.status|default:"-" }}</dd>
|
<dd>{{ lease.status|default:"-" }}</dd>
|
||||||
<dt>{% trans "Degraded" %}</dt>
|
<dt>{% trans "Degraded" %}</dt>
|
||||||
<dd>{{ lease.degraded|yesno|capfirst }}</dd>
|
<dd>{{ lease.degraded|yesno|capfirst|default:"-" }}</dd>
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -45,13 +45,24 @@
|
|||||||
{% for reservation in lease.reservations %}
|
{% for reservation in lease.reservations %}
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl class="dl-horizontal">
|
<dl class="dl-horizontal">
|
||||||
|
<dt>{% trans "id" %}</dt>
|
||||||
|
<dd>{{ reservation.id|default:"-" }}</dd>
|
||||||
|
<dt>{% trans "status" %}</dt>
|
||||||
|
<dd>{{ reservation.status|default:"-" }}</dd>
|
||||||
|
<dt>{% trans "resource type" %}</dt>
|
||||||
|
<dd>{{ reservation.resource_type|default:"-" }}</dd>
|
||||||
|
<dt>{% trans "missing resources" %}</dt>
|
||||||
|
<dd>{{ reservation.missing_resources|yesno|capfirst|default:"-" }}</dd>
|
||||||
|
<dt>{% trans "resources changed" %}</dt>
|
||||||
|
<dd>{{ reservation.resources_changed|yesno|capfirst|default:"-" }}</dd>
|
||||||
{% for key, value in reservation.items %}
|
{% for key, value in reservation.items %}
|
||||||
{% if 'ted_at' in key %}
|
{% if key not in reservation_generals %}
|
||||||
<dt>{{ key }}</dt>
|
<dt>{{ key }}</dt>
|
||||||
<dd>{{ value|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}</dd>
|
{% if value is True or value is False %}
|
||||||
{% else %}
|
<dd>{{ value|yesno|capfirst|default:"-" }}</dd>
|
||||||
<dt>{{ key }}</dt>
|
{% else %}
|
||||||
<dd>{{ value }}</dd>
|
<dd>{{ value|default:"-" }}</dd>
|
||||||
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</dl>
|
</dl>
|
||||||
|
Loading…
Reference in New Issue
Block a user