Merge changes from topics "VID-45", "VID-44"

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / controller / InstantiationController.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 12dd779..673d2f6 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -162,13 +162,10 @@
             if ((!($scope.isObjectEmpty(svcModel))) && (!($scope.isObjectEmpty(svcModel.vnfs)))) {\r
                 if ((svcModel.isNewFlow) && (vnfModelCustomizationUuid != null)) {\r
                     vnfModel = svcModel.vnfs[vnfModelCustomizationUuid];\r
-                    if (vnfModel !== undefined) {\r
-\r
-                        if (!($scope.isObjectEmpty(vnfModel.volumeGroups))) {\r
+                    if (vnfModel !== undefined && !($scope.isObjectEmpty(vnfModel.volumeGroups))) {\r
                             //console.log ("vnfModel.volumeGroups: "); console.log (JSON.stringify(vnfModel.volumeGroups, null, 4));\r
                             return (vnfModel.volumeGroups);\r
                         }\r
-                    }\r
                 }\r
                 else {\r
                     // old flow\r