x/tuskar-ui
Code Issues Proposed changes

show proper error message in VNC tab if instance not ready

Browse Source 
* fix bug 965555

Change-Id: I01dd86d0131637851eb14740bb52b7ac0347e3f1
This commit is contained in:
Andy Chong 2012-03-27 11:03:35 +08:00
parent b2ff1ee446
commit d750fc41d2
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/dashboards/nova/instances_and_volumes/instances/tabs.py
View File

@ -66,7 +66,7 @@ class VNCTab(tabs.Tab):
exceptions.handle(request,
_('Unable to get VNC console for '
'instance "%s".') % instance.id)
return {'vnc_url': vnc_url}
return {'vnc_url': vnc_url, 'instance_id': instance.id}
class InstanceDetailTabs(tabs.TabGroup):

5
horizon/dashboards/nova/templates/nova/instances_and_volumes/instances/_detail_vnc.html
View File

@ -1,5 +1,10 @@
{% load i18n %}
<h3>{% trans "Instance VNC Console" %}</h3>
{% if vnc_url %}
<p class='alert alert-info'>{% blocktrans %}If VNC console is not responding to keyboard input: click the grey status bar below.{% endblocktrans %}</p>
<iframe src="{{ vnc_url }}" width="720" height="430"></iframe>
{% else %}
<p class='alert alert-error'>{% blocktrans %}VNC console is currently unavailabe. Please try again later.{% endblocktrans %}
<a class='btn btn-mini' href="{% url horizon:nova:instances_and_volumes:instances:detail instance_id %}">{% trans "Reload" %}</a></p>
{% endif %}