aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmichai Hemli <ah0398@intl.att.com>2019-08-28 11:34:13 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-28 11:34:13 +0000
commite7021a29f0df8b40d64c8e7054c103f0d1369fa2 (patch)
treef50902e650abc2acf9f9911f68654841bcb4a75e
parent4f7c6678547c747963e2889d9dd5013fd18c1c97 (diff)
parent1b4bba330dcd11cf34d86f4e25c7e3a4082ea343 (diff)
Merge "Pass optionId in msoParameterList, letting late deconstruction of owner+region"
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js2
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/services/deleteResumeService.js2
2 files changed, 2 insertions, 2 deletions
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;