openstack
/
horizon
Code Issues Proposed changes

Merge "Network and subnet names are empty"

This commit is contained in:
Zuul 2018-11-05 20:10:27 +00:00 committed by Gerrit Code Review
parent 66c2fabda9 fc53f35264
commit ad290da6c6
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>