openstack
/
horizon
Code Issues Proposed changes

Merge "Make the "Select Boot Source" order deterministic"

This commit is contained in:
Jenkins 2017-05-30 17:14:27 +00:00 committed by Gerrit Code Review
parent a2f08e67ed b0099bbb87
commit 7a5b4a71a3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
View File

@ -671,6 +671,9 @@
type: type,
label: label
});
model.allowedBootSources.sort(function(a, b) {
return a.type > b.type;
});
}
}

3
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
View File

@ -393,8 +393,7 @@
return $scope.model.allowedBootSources;
},
function changeBootSource(newValue) {
if (angular.isArray(newValue) && newValue.length > 0 &&
!$scope.model.newInstanceSpec.source_type) {
if (angular.isArray(newValue) && newValue.length > 0) {
updateBootSourceSelection(newValue[0].type);
$scope.model.newInstanceSpec.source_type = newValue[0];
}