openstack
/
horizon
Code Issues Proposed changes

Merge "Add Project ID information in detail page"

This commit is contained in:
Zuul 2019-02-15 16:07:19 +00:00 committed by Gerrit Code Review
parent 7649526278 99b89a430e
commit 439206053c
5 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/api/cinder.py
View File

@ -96,6 +96,10 @@ class Volume(BaseCinderAPIResourceWrapper):
def is_bootable(self):
return self.bootable == 'true'
@property
def tenant_id(self):
return getattr(self, 'os-vol-tenant-attr:tenant_id', "")
class VolumeSnapshot(BaseCinderAPIResourceWrapper):
@ -104,6 +108,10 @@ class VolumeSnapshot(BaseCinderAPIResourceWrapper):
'os-extended-snapshot-attributes:project_id',
'metadata']
@property
def project_id(self):
return getattr(self, 'os-extended-snapshot-attributes:project_id', "")
class VolumeType(BaseCinderAPIResourceWrapper):

6
openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
View File

@ -4,10 +4,12 @@
<dl class="dl-horizontal">
<dt>{% trans "Name" %}</dt>
<dd data-display="{{ instance.name|default:instance.id }}" class="word-wrap">{{ instance.name }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ instance.description|default:_("-") }}</dd>
<dt>{% trans "ID" %}</dt>
<dd>{{ instance.id }}</dd>
<dt>{% trans "Description" %}</dt>
<dd>{{ instance.description|default:_("-") }}</dd>
<dt>{% trans "Project ID" %}</dt>
<dd>{{ instance.tenant_id|default:_("-") }}</dd>
<dt>{% trans "Status" %}</dt>
<dd>{{ instance.status_label|title }}</dd>
{% if instance.locked != None %}

2
openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
View File

@ -6,6 +6,8 @@
<dd class="word-wrap">{{ subnet.name|default:_("None") }}</dd>
<dt title="{% trans 'ID' %}">{% trans "ID" %}</dt>
<dd data-display="{{ subnet.name_or_id }}">{{subnet.id|default:_("None") }}</dd>
<dt>{% trans "Project ID" %}</dt>
<dd>{{ subnet.tenant_id|default:_("-") }}</dd>
<dt title="{% trans 'Network Name' %}">{% trans "Network Name" %}</dt>
<dd class="word-wrap">{{ subnet.network_name|default:_("None") }}</dd>
<dt title="{% trans 'Network ID' %}">{% trans "Network ID" %}</dt>

2
openstack_dashboard/dashboards/project/snapshots/templates/snapshots/_detail_overview.html
View File

@ -10,6 +10,8 @@
<dt>{% trans "Description" %}</dt>
<dd>{{ snapshot.description }}</dd>
{% endif %}
<dt>{% trans "Project ID" %}</dt>
<dd>{{ snapshot.project_id|default:_("-") }}</dd>
<dt>{% trans "Status" %}</dt>
<dd>{{ snapshot.status|replace_underscores|capfirst }}</dd>
<dt>{% trans "Volume" %}</dt>

2
openstack_dashboard/dashboards/project/volumes/templates/volumes/_detail_overview.html
View File

@ -10,6 +10,8 @@
<dt>{% trans "Description" %}</dt>
<dd>{{ volume.description }}</dd>
{% endif %}
<dt>{% trans "Project ID" %}</dt>
<dd>{{ volume.tenant_id|default:_("-") }}</dd>
<dt>{% trans "Status" %}</dt>
<dd>{{ volume.status_label|capfirst }}</dd>
<dt>{% trans "Group" %}</dt>