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 7d3b5d2..b8e99b1 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,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 ae8a047..7590bdf 100644 (file)
--- 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 () {
         });\r
         return o;\r
     };\r
-\r
+    /*\r
     $('#createNS').click(function(){\r
         var formData = JSON.stringify($("#neForm").serializeObject());\r
         var jsonobj = JSON.parse(formData);\r
@@ -110,7 +110,7 @@ $(function () {
                     alert("Error on page : " + xhr.responseText);\r
                 }\r
             });\r
-    });\r
+    });*/\r
     //init the templates combo\r
     $.when(\r
             generateTemplatesComponent()\r