openstack
/
horizon
Code Issues Proposed changes

Merge "Policy translation in server group form"

This commit is contained in:
Zuul 2019-04-22 08:09:11 +00:00 committed by Gerrit Code Review
parent 0699e1d8ab b59b4effd9
commit fab508998c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/server-groups/server-groups.controller.js
View File

@ -34,6 +34,12 @@
*/
function LaunchInstanceServerGroupsController(launchInstanceModel) {
var ctrl = this;
ctrl.policies = {
'affinity': gettext('Affinity'),
'anti-affinity': gettext('Anti Affinity'),
'soft-anti-affinity': gettext('Soft Anti Affinity'),
'soft-affinity': gettext('Soft Affinity')
};
ctrl.tableData = {
available: launchInstanceModel.serverGroups,

2
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/server-groups/server-groups.html
View File

@ -42,7 +42,7 @@
<tr ng-repeat="row in $displayedItems track by row.id"
ng-if="$isAllocatedTable || ($isAvailableTable && !trCtrl.allocatedIds[row.id])">
<td class="rsp-p1">{$ row.name $}</td>
<td class="rsp-p1">{$ row.policies[0] | noValue $}</td>
<td class="rsp-p1">{$ ctrl.policies[row.policies[0]] | noValue $}</td>
<td class="actions_column">
<action-list>
<action ng-if="$isAllocatedTable"