diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-18 01:16:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-18 01:16:05 +0000 |
| commit | 45f78b4ce34b53d281b738dde10179cc068470d3 (patch) | |
| tree | 676dd500b467ba8831b6526cc9ed8e3c16b91951 /openstack_dashboard/dashboards | |
| parent | 099877f748e6e1d03b0816f6727337d4e9022449 (diff) | |
| parent | 0fc4d7f88fd65fa0911388f3cc8ee373e0dec0b5 (diff) | |
| download | horizon-45f78b4ce34b53d281b738dde10179cc068470d3.tar.gz | |
Merge "fix Instance table's Flavor Detail popover not showing up"
Diffstat (limited to 'openstack_dashboard/dashboards')
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/tables.py | 2 | ||||
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py index ecda70f7a..1d48d3e0d 100644 --- a/openstack_dashboard/dashboards/project/instances/tables.py +++ b/openstack_dashboard/dashboards/project/instances/tables.py @@ -671,7 +671,7 @@ def get_size(instance): size_disk = _("%s GB") % "0" context = { "name": instance.full_flavor.name, - "flavor_id": instance.full_flavor.id, + "id": instance.id, "size_disk": size_disk, "size_ram": size_ram, "vcpus": instance.full_flavor.vcpus diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html index 685dd68e1..63e8fa394 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_instance_flavor.html @@ -1,5 +1,5 @@ {% load i18n %} -<a href="#" id="flavor_details_{{ flavor_id }}" class="link-popover" rel="popover" data-content=" +<a href="#" id="flavor_details_{{ id }}" class="link-popover" rel="popover" data-content=" <table class='table table-bordered'> <tr><th>{% trans 'VCPUs' %}</th><td>{{ vcpus }}</td></tr> <tr><th>{% trans 'RAM' %}</th><td>{{ size_ram }}</td></tr> @@ -8,6 +8,6 @@ " data-original-title="{% trans "Flavor Details" %}: {{ name }}">{{ name }}</a> <script type="text/javascript" charset="utf-8"> $(function () -{ $("#flavor_details_{{ flavor_id }}").popover(); +{ $("#flavor_details_{{ id }}").popover(); }); </script> |