summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-13 15:09:24 +0000
committerGerrit Code Review <review@openstack.org>2017-06-13 15:09:24 +0000
commita1d1615459b33434030205da160c2becc0b1080c (patch)
tree546a4face50975277065e7b7dbdd8fddcee03aa9
parent173f35d31303868ba177d273904233e9ece49d2a (diff)
parent32b9d5c748d1d9b17ad8ffc126638105b2c9efd8 (diff)
Merge "Make the "Select Boot Source" order deterministic" into stable/ocata
-rw-r--r--openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js3
-rw-r--r--openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js3
2 files changed, 4 insertions, 2 deletions
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
index f03ddb2..f96a277 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/launch-instance-model.service.js
@@ -659,6 +659,9 @@
659 type: type, 659 type: type,
660 label: label 660 label: label
661 }); 661 });
662 model.allowedBootSources.sort(function(a, b) {
663 return a.type > b.type;
664 });
662 } 665 }
663 } 666 }
664 667
diff --git a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
index 391b8e7..8444d70 100644
--- a/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
+++ b/openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.controller.js
@@ -393,8 +393,7 @@
393 return $scope.model.allowedBootSources; 393 return $scope.model.allowedBootSources;
394 }, 394 },
395 function changeBootSource(newValue) { 395 function changeBootSource(newValue) {
396 if (angular.isArray(newValue) && newValue.length > 0 && 396 if (angular.isArray(newValue) && newValue.length > 0) {
397 !$scope.model.newInstanceSpec.source_type) {
398 updateBootSourceSelection(newValue[0].type); 397 updateBootSourceSelection(newValue[0].type);
399 $scope.model.newInstanceSpec.source_type = newValue[0]; 398 $scope.model.newInstanceSpec.source_type = newValue[0];
400 } 399 }