diff --git a/blazar_dashboard/api/client.py b/blazar_dashboard/api/client.py index 88f787a..e97c99c 100644 --- a/blazar_dashboard/api/client.py +++ b/blazar_dashboard/api/client.py @@ -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) diff --git a/blazar_dashboard/content/leases/tables.py b/blazar_dashboard/content/leases/tables.py index 735ff14..42a0d29 100644 --- a/blazar_dashboard/content/leases/tables.py +++ b/blazar_dashboard/content/leases/tables.py @@ -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),) diff --git a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html index c18aca6..bc91f41 100644 --- a/blazar_dashboard/content/leases/templates/leases/_detail_overview.html +++ b/blazar_dashboard/content/leases/templates/leases/_detail_overview.html @@ -15,12 +15,8 @@
{{ lease.start_date|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}
{% trans "End date" %}
{{ lease.end_date|parse_isotime|date:"Y-m-d H:i T"|default:"-" }}
-
{% trans "Action" %}
-
{{ lease.action|default:"-" }}
{% trans "Status" %}
{{ lease.status|default:"-" }}
-
{% trans "Status Reason" %}
-
{{ lease.status_reason|default:"-" }}
{% trans "Degraded" %}
{{ lease.degraded|yesno|capfirst }}
diff --git a/blazar_dashboard/test/test_data/blazar_data.py b/blazar_dashboard/test/test_data/blazar_data.py index cb566d5..173e351 100644 --- a/blazar_dashboard/test/test_data/blazar_data.py +++ b/blazar_dashboard/test/test_data/blazar_data.py @@ -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