openstack
/
blazar-dashboard
Code Issues Proposed changes

Merge "Remove unused status related fields" into stable/queens

This commit is contained in:
Zuul 2018-02-27 11:59:11 +00:00 committed by Gerrit Code Review
parent eb3c5462d4 166f4ad6e4
commit 44fb789958
4 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blazar_dashboard/api/client.py
View File

@ -33,8 +33,7 @@ class Lease(base.APIDictWrapper):
) = ('IN_PROGRESS', 'FAILED', 'COMPLETE')
_attrs = ['id', 'name', 'start_date', 'end_date', 'user_id', 'project_id',
'before_end_date', 'action', 'status', 'status_reason',
'degraded']
'before_end_date', 'status', 'degraded']
def __init__(self, apiresource):
super(Lease, self).__init__(apiresource)

2
blazar_dashboard/content/leases/tables.py
View File

@ -84,9 +84,7 @@ class LeasesTable(tables.DataTable):
filters=(filters.parse_isotime,
partial(django_filters.date,
arg='Y-m-d H:i T')),)
action = tables.Column("action", verbose_name=_("Action"),)
status = tables.Column("status", verbose_name=_("Status"),)
status_reason = tables.Column("status_reason", verbose_name=_("Reason"),)
degraded = tables.Column("degraded", verbose_name=_("Degraded"),
filters=(django_filters.yesno,
django_filters.capfirst),)

4
blazar_dashboard/content/leases/templates/leases/_detail_overview.html
View File

@ -15,12 +15,8 @@
<dd>{{ lease.start_date|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}</dd>
<dt>{% trans "End date" %}</dt>
<dd>{{ lease.end_date|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}</dd>
<dt>{% trans "Action" %}</dt>
<dd>{{ lease.action|default:"-" }}</dd>
<dt>{% trans "Status" %}</dt>
<dd>{{ lease.status|default:"-" }}</dd>
<dt>{% trans "Status Reason" %}</dt>
<dd>{{ lease.status_reason|default:"-" }}</dd>
<dt>{% trans "Degraded" %}</dt>
<dd>{{ lease.degraded|yesno|capfirst }}</dd>
</dl>

4
blazar_dashboard/test/test_data/blazar_data.py
View File

@ -69,9 +69,7 @@ lease_sample1 = {
}
],
'id': '6ee55c78-ac52-41a6-99af-2d2d73bcc466',
'action': None,
'project_id': 'aa45f56901ef45ee95e3d211097c0ea3',
'status_reason': None,
'start_date': '2017-06-27T18:00:00.000000',
'trust_id': 'b442a580b9504ababf305bf2b4c49512',
'degraded': False
@ -131,9 +129,7 @@ lease_sample2 = {
}
],
'id': 'ef32abe8-a1f7-4c2f-b5f2-941428848230',
'action': None,
'project_id': 'aa45f56901ef45ee95e3d211097c0ea3',
'status_reason': None,
'start_date': '2017-06-27T18:00:00.000000',
'trust_id': 'b442a580b9504ababf305bf2b4c49512',
'degraded': False