openstack
/
horizon
Code Issues Proposed changes

Network and subnet names are empty 

On the Create Instance page,
the network name or subnet name is empty,
if there is no network name or subnet name

Change-Id: I40cedcbfa78df03b316bf570dda194c2502ec03b
Closes-Bug: #1800594
This commit is contained in:
pengyuesheng 2018-10-30 15:20:26 +08:00
parent 9219ada359
commit fc53f35264
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/network/network.html
View File

@ -38,9 +38,9 @@
<span class="fa fa-chevron-right" hz-expand-detail
title="{$ 'Click to see more details'|translate $}"></span>
</td>
<td class="rsp-p1 word-break">{$ row.name $}</td>
<td class="rsp-p1 word-break">{$ row.name || row.id $}</td>
<td class="rsp-p2">
<div ng-repeat="subnet in row.subnets">{$ subnet.name $}</div>
<div ng-repeat="subnet in row.subnets">{$ subnet.name || subnet.id $}</div>
</td>
<td class="rsp-p1">{$ row.shared | yesno $}</td>
<td class="rsp-p1">{$ row.admin_state | decode:ctrl.networkAdminStates $}</td>
@ -113,9 +113,9 @@
<span class="fa fa-chevron-right" hz-expand-detail
title="{$ 'Click to see more details'|translate $}"></span>
</td>
<td class="rsp-p1 word-break">{$ row.name$}</td>
<td class="rsp-p1 word-break">{$ row.name || row.id $}</td>
<td class="rsp-p2">
<div ng-repeat="subnet in row.subnets">{$ subnet.name $}</div>
<div ng-repeat="subnet in row.subnets">{$ subnet.name || subnet.id $}</div>
</td>
<td class="rsp-p1">{$ row.shared | yesno $}</td>
<td class="rsp-p1">{$ row.admin_state | decode:ctrl.networkAdminStates $}</td>