From 073848663de3912843a852b4747299b200cae3e7 Mon Sep 17 00:00:00 2001 From: David TARDIVEL Date: Thu, 15 Dec 2016 15:54:10 +0100 Subject: [PATCH] 'next_uuid' Action field is replaced by 'parents' 'next_uuid' field has been replaced by 'parents' field, which is a list of parents action linked to a current one. In that case, I propose to remove this information (there is a column in the dashboard) which is not readable and give unclear information about actions workflow. Partially Implements: blueprint planner-storage-action-plan Depends-On: Ide2c8fc521488e486eac8f9f89d3f808ccf4b4d7 Change-Id: Iccaa5bfe89a1897ef3d93088c7cd2d3ee2cdef6a --- watcher_dashboard/content/actions/tables.py | 17 ----------------- .../templates/infra_optim/actions/details.html | 3 --- 2 files changed, 20 deletions(-) diff --git a/watcher_dashboard/content/actions/tables.py b/watcher_dashboard/content/actions/tables.py index 62e64c9..c1951e7 100644 --- a/watcher_dashboard/content/actions/tables.py +++ b/watcher_dashboard/content/actions/tables.py @@ -61,15 +61,6 @@ class ActionsFilterAction(horizon.tables.FilterAction): policy_rules = (("infra-optim", "action:detail"),) -def get_next_action_uuid_link(datum): - try: - return urlresolvers.reverse( - "horizon:admin:actions:detail", - kwargs={"action_uuid": getattr(datum, "next_uuid", None)}) - except urlresolvers.NoReverseMatch: - return None - - def get_action_plan_link(datum): try: return urlresolvers.reverse( @@ -97,10 +88,6 @@ class ActionsTable(horizon.tables.DataTable): 'action_plan_uuid', verbose_name=_('Action Plan'), link=get_action_plan_link) - next_action = horizon.tables.Column( - 'next_uuid', - verbose_name=_('Next Action'), - link=get_next_action_uuid_link) def get_object_id(self, datum): return datum.uuid @@ -130,10 +117,6 @@ class RelatedActionsTable(horizon.tables.DataTable): 'action_plan_uuid', verbose_name=_('Action Plan'), link=get_action_plan_link) - next_action = horizon.tables.Column( - 'next_uuid', - verbose_name=_('Next Action'), - link=get_next_action_uuid_link) def get_object_id(self, datum): return datum.uuid diff --git a/watcher_dashboard/templates/infra_optim/actions/details.html b/watcher_dashboard/templates/infra_optim/actions/details.html index a425880..39330f9 100644 --- a/watcher_dashboard/templates/infra_optim/actions/details.html +++ b/watcher_dashboard/templates/infra_optim/actions/details.html @@ -20,9 +20,6 @@
{{ action.action_plan_uuid|default:_("—") }}
- {% url 'horizon:admin:actions:detail' action.next_uuid as next_action_url %} -
{% trans "Next Action" %}
-
{{ action.next_uuid|default:_("—") }}
{% trans "State" %}
{{ action.state|default:"—" }}
{% trans "Created At" %}