diff --git a/app/scripts/modules/openstack/common/cacheBackedMultiSelect.template.html b/app/scripts/modules/openstack/common/cacheBackedMultiSelect.template.html index 9ede35d5ba5..eb5a0eff46f 100644 --- a/app/scripts/modules/openstack/common/cacheBackedMultiSelect.template.html +++ b/app/scripts/modules/openstack/common/cacheBackedMultiSelect.template.html @@ -10,7 +10,7 @@
- +
diff --git a/app/scripts/modules/openstack/loadBalancer/configure/wizard/interface.html b/app/scripts/modules/openstack/loadBalancer/configure/wizard/interface.html index 72ada9c13f2..51989554c82 100644 --- a/app/scripts/modules/openstack/loadBalancer/configure/wizard/interface.html +++ b/app/scripts/modules/openstack/loadBalancer/configure/wizard/interface.html @@ -1,11 +1,18 @@ diff --git a/app/scripts/modules/openstack/loadBalancer/configure/wizard/upsert.controller.js b/app/scripts/modules/openstack/loadBalancer/configure/wizard/upsert.controller.js index a3bdb3c714a..7232df07bd3 100644 --- a/app/scripts/modules/openstack/loadBalancer/configure/wizard/upsert.controller.js +++ b/app/scripts/modules/openstack/loadBalancer/configure/wizard/upsert.controller.js @@ -58,6 +58,7 @@ module.exports = angular.module('spinnaker.loadBalancer.openstack.create.control $scope.allSecurityGroups = []; $scope.$watch('loadBalancer.account', updateSecurityGroups); $scope.$watch('loadBalancer.region', updateSecurityGroups); + $scope.updateSecurityGroups = updateSecurityGroups; updateSecurityGroups(); // initialize controller @@ -158,6 +159,9 @@ module.exports = angular.module('spinnaker.loadBalancer.openstack.create.control this.accountUpdated = function() { ctrl.updateName(); $scope.subnetFilter = {type: 'openstack', account: $scope.loadBalancer.account, region: $scope.loadBalancer.region}; + if ($scope.loadBalancer) { + $scope.loadBalancer.securityGroups = []; + } updateLoadBalancerNames(); }; diff --git a/app/scripts/modules/openstack/network/networkSelectField.directive.js b/app/scripts/modules/openstack/network/networkSelectField.directive.js index c84599e9c4d..dae3758af95 100644 --- a/app/scripts/modules/openstack/network/networkSelectField.directive.js +++ b/app/scripts/modules/openstack/network/networkSelectField.directive.js @@ -51,10 +51,12 @@ module.exports = angular.module('spinnaker.openstack.network.networkSelectField. scope.onChange({network: newValue}); } } - }); - scope.$watch('filter', function() { scope.$broadcast('updateOptions'); }); + scope.$watch('filter', function() { + scope.$broadcast('onValueChanged'); + scope.updateOptions(); + }); } }; });