openstack
/
horizon
Code Issues Proposed changes

Merge "Rename heat logical_resource_id to resource_name"

This commit is contained in:
Jenkins 2013-08-28 04:46:02 +00:00 committed by Gerrit Code Review
parent 48e60c0073 c208701f58
commit 7a8e313ea8
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/stacks/api.py
View File

@ -61,7 +61,7 @@ def d3_data(request, stack_id=''):
else:
in_progress = False
resource_node = {
'name': resource.logical_resource_id,
'name': resource.resource_name,
'status': resource.resource_status,
'image': resource_image,
'required_by': resource.required_by,

10
openstack_dashboard/dashboards/project/stacks/tables.py
View File

@ -100,9 +100,9 @@ class StacksTable(tables.DataTable):
class EventsTable(tables.DataTable):
logical_resource = tables.Column('logical_resource_id',
logical_resource = tables.Column('resource_name',
verbose_name=_("Stack Resource"),
link=lambda d: d.logical_resource_id,)
link=lambda d: d.resource_name,)
physical_resource = tables.Column('physical_resource_id',
verbose_name=_("Resource"),
link=mappings.resource_to_url)
@ -144,9 +144,9 @@ class ResourcesTable(tables.DataTable):
("Create Failed", False),
)
logical_resource = tables.Column('logical_resource_id',
logical_resource = tables.Column('resource_name',
verbose_name=_("Stack Resource"),
link=lambda d: d.logical_resource_id)
link=lambda d: d.resource_name)
physical_resource = tables.Column('physical_resource_id',
verbose_name=_("Resource"),
link=mappings.resource_to_url)
@ -171,7 +171,7 @@ class ResourcesTable(tables.DataTable):
self.stack = kwargs['stack']
def get_object_id(self, datum):
return datum.logical_resource_id
return datum.resource_name
class Meta:
name = "resources"

2
openstack_dashboard/dashboards/project/stacks/templates/stacks/_resource_info.html
View File

@ -1,4 +1,4 @@
<h3>{{ resource.logical_resource_id }}</h3>
<h3>{{ resource.resource_name }}</h3>
{% if resource.resource_status == 'CREATE_FAILED' %}
<p class="error">{{ resource.resource_status_desc }}</p>

2
openstack_dashboard/dashboards/project/stacks/templates/stacks/_resource_overview.html
View File

@ -7,7 +7,7 @@
<hr class="header_rule">
<dl>
<dt>{% trans "Stack Resource ID" %}</dt>
<dd>{{ resource.logical_resource_id }}</dd>
<dd>{{ resource.resource_name }}</dd>
</dl>
<dl>
<dt>{% trans "Resource ID" %}</dt>

2
openstack_dashboard/dashboards/project/stacks/templates/stacks/resource.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Resource Detail" %}{% endblock %}
{% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Resource Detail: ")|add:resource.logical_resource_id %}
{% include "horizon/common/_page_header.html" with title=_("Resource Detail: ")|add:resource.resource_name %}
{% endblock page_header %}
{% block main %}