Merge "Pass optionId in msoParameterList, letting late deconstruction of owner+region"

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 ecc6042..51feb89 100644 (file)
--- 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 559174d..c13c721 100644 (file)
--- 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;