Merge "Add new audit fields in dashboard tables"

watcher_dashboard/content/audits/tables.py

@@ -113,9 +113,12 @@ class AuditsTable(horizon.tables.DataTable):
         'uuid',
         verbose_name=_("UUID"),
         link="horizon:admin:audits:detail")
-    audit_template = horizon.tables.Column(
-        'audit_template_name',
-        verbose_name=_('Audit Template'))
+    goal = horizon.tables.Column(
+        'goal_name',
+        verbose_name=_('Goal'))
+    strategy = horizon.tables.Column(
+        'strategy_name',
+        verbose_name=_('Strategy'))
     audit_type = horizon.tables.Column(
         'audit_type',
         verbose_name=_('Audit Type'))

watcher_dashboard/templates/infra_optim/audits/details.html

@@ -13,11 +13,13 @@
     <dl class="dl-horizontal">
         <dt>{% trans "UUID" %}</dt>
         <dd>{{ audit.uuid|default:"&mdash;" }}</dd>
+        <dt>{% trans "Goal" %}</dt>
+        <dd>{{ audit.goal_name|default:"&mdash;" }}</dd>
+        <dt>{% trans "Strategy" %}</dt>
+        <dd>{{ audit.strategy_name|default:"&mdash;" }}</dd>
         <dt>{% trans "Type" %}</dt>
         <dd>{{ audit.audit_type|default:"&mdash;" }}</dd>
         {% url 'horizon:admin:audit_templates:detail' audit.audit_template_uuid as audit_template_url %}
-        <dt>{% trans "Audit Template" %}</dt>
-        <dd><a href="{{ audit_template_url }}">{{ audit.audit_template_uuid|default:_("&mdash;") }}</a></dd>
         <dt>{% trans "State" %}</dt>
         <dd>{{ audit.state|default:"&mdash;" }}</dd>
         <dt>{% trans "Deadline" %}</dt>