aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-08-28 16:27:42 +0300
committerIttay Stern <ittay.stern@att.com>2019-08-28 18:50:37 +0300
commit9d0908e18d51a4ba1c4a54b01fcbe16598bd352a (patch)
treef633e5fad0b8629abdb739a286706fb48c69ef40 /vid-app-common
parent7648b9f8c631b346d30132c2b0fa29b14365b83c (diff)
Fix legacy region in resume vfModule5.0.1
Issue-ID: VID-378 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com> Change-Id: Idad1357d8de234ad54716d8d51ac846a426a5258 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common')
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js1
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js15
2 files changed, 5 insertions, 11 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 ac6d84faf..2cfcf5715 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
@@ -82,6 +82,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
$scope.deleteOrResume = function() {
var msoParameterList = [({id: "lcpRegion", value: $scope.regionSelection.optionId})];
+ msoParameterList.push({id: FIELD.ID.LCP_REGION_TEXT, value: $scope.regionSelection.legacyRegion});
msoParameterList.push({id: "tenant", value: $scope.regionSelection.tenant});
var requestParams = {};
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
index 1a296ca5d..972463745 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
@@ -775,20 +775,13 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
};
var buildCloudConfiguration = function (parameterList) {
- var lcpRegion;
- var cloudOwner;
var lcpRegionOptionId = getValueFromList(FIELD.ID.LCP_REGION, parameterList);
var cloudOwnerAndLcpCloudRegion = DataService.getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId);
- if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) {
- lcpRegion = getValueFromList(FIELD.ID.LCP_REGION_TEXT,
- parameterList);
- cloudOwner = undefined;
- } else {
- var cloudOwnerAndLcpCloudRegion = DataService.getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId);
- lcpRegion = cloudOwnerAndLcpCloudRegion.cloudRegionId;
- cloudOwner = cloudOwnerAndLcpCloudRegion.cloudOwner;
- }
+ var cloudOwner = cloudOwnerAndLcpCloudRegion.cloudOwner;
+ var lcpRegion = cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT ?
+ getValueFromList(FIELD.ID.LCP_REGION_TEXT,parameterList) :
+ cloudOwnerAndLcpCloudRegion.cloudRegionId;
return {
lcpCloudRegionId: lcpRegion,