From b5673ecd47f44d6a929f35603b91cebb432461fd Mon Sep 17 00:00:00 2001
From: Itxaka <iserrano@redhat.com>
Date: Wed, 10 Feb 2016 12:11:10 +0100
Subject: Net topology: Show console link only when useful

Right now we are showing the "open console" link on the
network topology screen for instances on each instance,
even if they are on a status that we know its not
going to allow the console to connect.

This patch makes it so the "open console" link will
only appear if the instance object has console data.

It also changes the order of getting the instance
data in the django part as to make less calls if we
dont need the console link.

Provides a list with known statuses that wont connect
to the console used to get the console data or not.

Change-Id: I536fee5186ac933b92a7dc01a2a5b82a6db0ae4c
Closes-Bug: #1543316
---
 .../network_topology/client_side/_balloon_container.html         | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'openstack_dashboard/dashboards/project/network_topology/templates/network_topology')

diff --git a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html
index bbf70c4ae..952609bc1 100644
--- a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html
+++ b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html
@@ -15,12 +15,11 @@
     <div class="footerInner">
       <div class="cell link">
         <a href="[[url]]">» [[view_details_label]]</a>
-        {% comment %}The Console link is available if settings.CONSOLE_TYPE is not set at all, or if it's set to any value other than None or False.{% endcomment %}
-        {% if console_type %}
-            [[#console_id]]
+          {% comment %}The console link will only appear if the console item is defined
+          on the javascript side while rendering the template.{% endcomment %}
+            [[#console]]
             <a href="[[url]][[console]]" class="vnc_window">» [[open_console_label]]</a>
-            [[/console_id]]
-        {%  endif %}
+            [[/console]]
       </div>
       [[#type]]
       <div class="cell delete">
-- 
cgit v1.2.1