From: Luji7 <lu.ji3@zte.com.cn>
Date: Thu, 27 Oct 2016 03:23:12 +0000 (+0800)
Subject: Fix Issue#GSO-54
X-Git-Tag: release/mercury~237
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6af003878a185b12e65f0a15ce83e8ea4bab5433;p=vnfsdk%2Frefrepo.git

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 b8e99b19..3df70f70 100644
--- 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
     	}