Merge "Make the "Select Boot Source" order deterministic" into stable/ocata
This commit is contained in:
commit
a1d1615459
|
@ -659,6 +659,9 @@
|
||||||
type: type,
|
type: type,
|
||||||
label: label
|
label: label
|
||||||
});
|
});
|
||||||
|
model.allowedBootSources.sort(function(a, b) {
|
||||||
|
return a.type > b.type;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -393,8 +393,7 @@
|
||||||
return $scope.model.allowedBootSources;
|
return $scope.model.allowedBootSources;
|
||||||
},
|
},
|
||||||
function changeBootSource(newValue) {
|
function changeBootSource(newValue) {
|
||||||
if (angular.isArray(newValue) && newValue.length > 0 &&
|
if (angular.isArray(newValue) && newValue.length > 0) {
|
||||||
!$scope.model.newInstanceSpec.source_type) {
|
|
||||||
updateBootSourceSelection(newValue[0].type);
|
updateBootSourceSelection(newValue[0].type);
|
||||||
$scope.model.newInstanceSpec.source_type = newValue[0];
|
$scope.model.newInstanceSpec.source_type = newValue[0];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue