From 95ea3bac38467090417056254ef6e4b3165e27d7 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Thu, 1 Aug 2019 15:59:56 +0300 Subject: handling legacy region in vfModule resume Issue-ID: VID-482 Signed-off-by: Eylon Malin Change-Id: If0cca27729e2d7313fd1836191a35d223e276070 --- .../main/webapp/app/vid/scripts/services/deleteResumeService.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'vid-app-common') 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 817bef670..aac0ed468 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 @@ -293,13 +293,12 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService, var cloudOwner; var lcpRegionOptionId = getValueFromList(FIELD.ID.LCP_REGION, parameterList); - - if (lcpRegionOptionId === FIELD.KEY.LCP_REGION_TEXT) { + var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId); + if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) { lcpRegion = getValueFromList(FIELD.ID.LCP_REGION_TEXT, parameterList); cloudOwner = undefined; } else { - var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(lcpRegionOptionId); lcpRegion = cloudOwnerAndLcpCloudRegion.cloudRegionId; cloudOwner = cloudOwnerAndLcpCloudRegion.cloudOwner; } @@ -478,7 +477,9 @@ var DeleteResumeService = function($log, AaiService, AsdcService, DataService, parameterListControl .updateList([ FIELD.PARAMETER.TENANT_DISABLED ]); } - if (list[0].value === FIELD.KEY.LCP_REGION_TEXT) { + + var cloudOwnerAndLcpCloudRegion = getCloudOwnerAndLcpCloudRegionFromOptionId(list[0].value); + if (cloudOwnerAndLcpCloudRegion.cloudRegionId === FIELD.KEY.LCP_REGION_TEXT) { parameterListControl .updateList([ FIELD.PARAMETER.LCP_REGION_TEXT_VISIBLE ]); } else { -- cgit 1.2.3-korg