From: c00149107 <chenchuanyu@huawei.com>
Date: Thu, 27 Oct 2016 02:34:32 +0000 (+0800)
Subject: fix issue:GSO-54
X-Git-Tag: release/mercury~238
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=12602352378ceb68202dd7265d0dcb1f0564d14c;p=vnfsdk%2Frefrepo.git

fix issue:GSO-54

Change-Id: I1fad2dcbfb2ae8050786ba0f93c39cf7633ddc61
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
---

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 7d3b5d23..b8e99b19 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,6 +184,10 @@ function fetchGsoNestingTemplateParameters(templateId) {
 	    		    		nestingParasAggregatation.notify(oneNodeParameters);
 	    		    	});
 	    		    	serviceTemplates.forEach(function(serviceTemplate) {
+							if(serviceTemplate == null || serviceTemplate == undefined)
+							{
+								return [];
+							}
 	    		    		var inputs = serviceTemplate.inputs.map(function(input) {
 	    		    			input.name = nodeTemplate.type + '.' + input.name;
 	    		    			return input;
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
index ae8a0474..7590bdf7 100644
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/rest.js
@@ -85,7 +85,7 @@ $(function () {
         });
         return o;
     };
-
+    /*
     $('#createNS').click(function(){
         var formData = JSON.stringify($("#neForm").serializeObject());
         var jsonobj = JSON.parse(formData);
@@ -110,7 +110,7 @@ $(function () {
                     alert("Error on page : " + xhr.responseText);
                 }
             });
-    });
+    });*/
     //init the templates combo
     $.when(
             generateTemplatesComponent()