From 022efbf54ddd662ede2d000a847ed02ca6d05d97 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Sun, 12 Jan 2020 14:35:39 +0200 Subject: fix open modern ui from Create new service instance flow Issue-ID: VID-724 Change-Id: I804aadce8fcdf888ef4364e474e8cc229b158920 Signed-off-by: Eylon Malin Signed-off-by: Yoav Schneiderman --- .../webapp/app/vid/scripts/controller/creationDialogController.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'vid-app-common/src/main/webapp/app/vid/scripts') diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js index 7b6d4af6c..a6f6cc69d 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/creationDialogController.js @@ -93,11 +93,14 @@ var creationDialogController = function (COMPONENT, FIELD, PARAMETER, $scope, $h if (!$scope.shouldShowOldPopup()) { + let modelNameVersionId = request.modelNameVersionId ? + request.modelNameVersionId : + (DataService.getModelInfo(COMPONENT.SERVICE) ? DataService.getModelInfo(COMPONENT.SERVICE).modelNameVersionId : ""); if(DataService.getIsInstantiationTemplateExists()){ - $scope.url = COMPONENT.INSTANTIATION_TEMPLATES_IFRAME_URL + request.modelNameVersionId; + $scope.url = COMPONENT.INSTANTIATION_TEMPLATES_IFRAME_URL + modelNameVersionId; window.addEventListener("message", receiveMessage, false); }else { - $scope.url = COMPONENT.SERVICE_POPUP_IFRAME_URL + request.modelNameVersionId + "&isCreate=true&r=" + Math.random(); + $scope.url = COMPONENT.SERVICE_POPUP_IFRAME_URL + modelNameVersionId + "&isCreate=true&r=" + Math.random(); window.addEventListener("message", receiveMessage, false); } } -- cgit 1.2.3-korg