From 776cfb8a9b1b03cd8ad362bb020cf15d5c5a734b Mon Sep 17 00:00:00 2001 From: Scott Seago Date: Thu, 29 Nov 2018 09:58:40 -0500 Subject: [PATCH] Bug 1652491: filter security group list based on provider Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1652491 For setting the remote security group for security group rules, the dropdown included *all* security groups, including those for other providers. This commit filters the list to only show security groups for the current provider. --- .../security_group/security_group_form_controller.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/controllers/security_group/security_group_form_controller.js b/app/assets/javascripts/controllers/security_group/security_group_form_controller.js index aa7d229111f..eaa3e300fff 100644 --- a/app/assets/javascripts/controllers/security_group/security_group_form_controller.js +++ b/app/assets/javascripts/controllers/security_group/security_group_form_controller.js @@ -7,6 +7,7 @@ ManageIQ.angular.app.controller('securityGroupFormController', ['securityGroupFo name: '', description: '', firewall_rules: [], + ems_id: '' }; vm.ems = []; @@ -30,10 +31,11 @@ ManageIQ.angular.app.controller('securityGroupFormController', ['securityGroupFo } else { miqService.sparkleOn(); - $q.all([getSecurityGroup(securityGroupFormId), getSecurityGroups()]) + $q.all([getSecurityGroup(securityGroupFormId)]) .then(function() { vm.afterGet = true; vm.modelCopy = _.cloneDeep(vm.securityGroupModel); + getSecurityGroups(); miqService.sparkleOff(); }) .catch(miqService.handleFailure); @@ -41,7 +43,7 @@ ManageIQ.angular.app.controller('securityGroupFormController', ['securityGroupFo }; function getSecurityGroup(id) { - return API.get('/api/security_groups/' + id + '?attributes=name,ext_management_system.name,description,cloud_tenant.name,firewall_rules') + return API.get('/api/security_groups/' + id + '?attributes=name,ext_management_system.name,description,cloud_tenant.name,firewall_rules,ems_id') .then(function(data) { Object.assign(vm.securityGroupModel, data); vm.securityGroupModel.firewall_rules_delete = false; @@ -49,7 +51,7 @@ ManageIQ.angular.app.controller('securityGroupFormController', ['securityGroupFo } function getSecurityGroups() { - return API.get('/api/security_groups/?expand=resources&attributes=ems_ref,id,name') + return API.get('/api/providers/' + vm.securityGroupModel.ems_id + '/security_groups/?expand=resources&attributes=ems_ref,id,name') .then(function(data) { vm.security_groups_list = data.resources; });