Fix Issue#GSO-54

Change-Id: I90f21af1f3f00b3f9eba199a840774a22f1d757b
Signed-off-by: Luji7 <lu.ji3@zte.com.cn>

diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js
index b8e99b1..3df70f7 100644 (file)
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js
@@ -184,9 +184,10 @@ function fetchGsoNestingTemplateParameters(templateId) {
                                        nestingParasAggregatation.notify(oneNodeParameters);
                                });
                                serviceTemplates.forEach(function(serviceTemplate) {
-                                                       if(serviceTemplate == null || serviceTemplate == undefined)
+                                                       if(serviceTemplate === undefined || serviceTemplate.inputs === undefined || serviceTemplate.csarId === undefined)
                                                        {
-                                                               return [];
+                                                               nodeAggregatation.notify([]);
+                                                               return;
                                                        }
                                        var inputs = serviceTemplate.inputs.map(function(input) {
                                                input.name = nodeTemplate.type + '.' + input.name;
@@ -407,7 +408,7 @@ function createGsoServiceInstance(gatewayService, serviceInstance, serviceTempla
                'description': serviceInstance.description,
                'serviceDefId': serviceTemplate.gsarId,
                'templateId': serviceInstance.serviceTemplateId,
-               'templateName': serviceTemplate.templateName,
+               'templateName': serviceTemplate.name,
                'gatewayUri': gsoLcmUri,
                'parameters': serviceInstance.inputParameters
        }