From 1b4bba330dcd11cf34d86f4e25c7e3a4082ea343 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Wed, 28 Aug 2019 09:47:02 +0300 Subject: Pass optionId in msoParameterList, letting late deconstruction of owner+region Issue-ID: VID-378 Change-Id: I234bdd6c693c66621f187bb4e7ededd2c0324cac Signed-off-by: Ittay Stern --- .../vf-module-homing-data-action.controller.js | 2 +- .../src/main/webapp/app/vid/scripts/services/deleteResumeService.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'vid-app-common') diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js index ecc6042b6..51feb89ae 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js @@ -83,7 +83,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal $scope.deleteOrResume = function() { - var msoParameterList = [({id: "lcpRegion", value: getLcpRegionId()})]; + var msoParameterList = [({id: "lcpRegion", value: $scope.regionSelection.optionId})]; msoParameterList.push({id: "tenant", value: $scope.regionSelection.tenant}); var requestParams = {}; diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js index 559174ddf..c13c721f4 100644 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js @@ -294,7 +294,7 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService, var lcpRegionOptionId = getValueFromList(FIELD.ID.LCP_REGION, parameterList); var cloudOwnerAndLcpCloudRegion = DataService.getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId); - if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) { + if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) { // == if is megaRegion lcpRegion = getValueFromList(FIELD.ID.LCP_REGION_TEXT, parameterList); cloudOwner = undefined; -- cgit 1.2.3-korg