From: Luji7 <lu.ji3@zte.com.cn>
Date: Thu, 27 Oct 2016 08:56:17 +0000 (+0800)
Subject: Fix Issue#GSO-54
X-Git-Tag: release/sun~66
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=04a10aa5b5a86db5ad7730b33d1fcd5b5b7e8010;p=vnfsdk%2Frefrepo.git

Fix Issue#GSO-54

Change-Id: Icd833b57dfa9354c3211cd26fdf4b4a16cd4f223
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 1bf0fee8..c7253940 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
@@ -185,7 +185,7 @@ function fetchGsoNestingTemplateParameters(templateId) {
 	    		    		nestingParasAggregatation.notify(oneNodeParameters);
 	    		    	});
 	    		    	serviceTemplates.forEach(function(serviceTemplate) {
-                            if(serviceTemplate === undefined || serviceTemplate.inputs === undefined || serviceTemplate.csarId === undefined)
+                            if(serviceTemplate === null || serviceTemplate === undefined || serviceTemplate.inputs === undefined || serviceTemplate.csarId === undefined)
                             {
                                 nodeAggregatation.notify([]);
                                 return;
@@ -409,7 +409,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
     	}