Fix the bug "Can not show package detail", remove the modeldsigner child menu.

Change-Id: I6d9231db6e0d8458c33a228861a441ea27707ba5
Issue-id:GSO-86
Signed-off-by: nancylizi <li.zi30@zte.com.cn>

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
index 3b19d23..714d953 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js
@@ -83,6 +83,7 @@ var vm = avalon.define({
         setting.language = vm.$language;\r
         setting.paginate = true;\r
         setting.info = true;\r
+        setting.sort = true;\r
         setting.columns = vm.$packageTableFields.table;\r
         setting.restUrl = vm.$restUrl.queryPackageInfoUrl;\r
         setting.tableId = vm.$tableId;\r
@@ -120,15 +121,13 @@ var vm = avalon.define({
             vm.packageDetail.detailData[index].isActive = true;\r
         },\r
         $initPackageDetailTable : function (csarId) {\r
-            var data;\r
-            for(var i=0; i<vm.resource.packageInfo.length; i++) {\r
-                if (vm.resource.packageInfo[i].csarId == csarId) {\r
-                    data = vm.resource.packageInfo[i];\r
-                    break;\r
+            var url=vm.$restUrl.queryPackageInfoUrl + "/" + csarId;\r
+            commonUtil.get(url,null,function(resp) {\r
+                if (resp) {\r
+                    vm.resource.packageDetails=resp;\r
                 }\r
-            }\r
-            vm.resource.packageDetails = data;\r
-            vm.resource.relationInfo = [];\r
+       })\r
+\r
         },\r
         $isRowDeletingStatus : function(name) {\r
             var table = $("#" + vm.$tableId).dataTable();\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
index d69be0a..80067ab 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmUtil.js
@@ -110,8 +110,13 @@ pmUtil.doOnBoard = function(url,param) {
                 }\r
                 refreshByCond();\r
             },\r
-            error : function() {\r
-                commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
+            error : function(resp) {\r
+                if(resp != "" && resp.responseText == "success") {\r
+                    commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoarded"), "success");\r
+                    refreshByCond();\r
+                } else {\r
+                    commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
+                }\r
             }\r
         });\r
     }\r
@@ -132,7 +137,7 @@ pmUtil.doNFAROnboard = function(extData) {
             }\r
             refreshByCond();\r
         },\r
-        error : function() {\r
+        error : function(resp) {\r
             commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
         }\r
     });\r
@@ -151,7 +156,7 @@ pmUtil.doSSAROnboard = function(url) {
             }\r
             refreshByCond();\r
         },\r
-        error : function() {\r
+        error : function(resp) {\r
             commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-onBoard-error"), "failed");\r
         }\r
     });\r
@@ -182,7 +187,7 @@ pmUtil.delPackage = function (url) {
 \r
 pmUtil.nameRender = function(obj) {\r
     return '<a href="#" onclick="vm.packageDetail.$showDetails('\r
-        + '\'block\',\'' + obj.aData.id + '\', \'' + obj.aData.name + '\')">' + obj.aData.name + '</a>';\r
+        + '\'block\',\'' + obj.aData.csarId + '\', \'' + obj.aData.name + '\')">' + obj.aData.name + '</a>';\r
 }\r
 \r
 pmUtil.onBoardRender = function(obj) {\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
index 2c0561e..47bd9a5 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/topoUtil.js
@@ -388,7 +388,7 @@ topoUtil.generateNodeTemplate = function(data) {
        nodeTemplate.currentLinkNum = 0;\r
        var relationShips = data.relationShips || []; //some nodes may not have relationships\r
        $.each(relationShips, function(index, obj){\r
-               if (obj.sourceNodeId == data.id) {\r
+               if (obj.sourceNodeId == data.name) {\r
                        switch(obj.type) {\r
                                case "containedIn" :\r
                                case "tosca.relationships.nfv.ContainedIn" :\r
@@ -414,7 +414,7 @@ topoUtil.generateNodeTemplate = function(data) {
                                        break;\r
                        }\r
                }\r
-               if (obj.targetNodeId == data.id) {\r
+               if (obj.targetNodeId == data.name) {\r
                        switch(obj.type) {\r
                                case "connectedTo" : \r
                                case "tosca.relationships.nfv.ConnectsTo" :\r

diff --git a/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json b/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
index d99bce1..b7c088f 100644 (file)
--- a/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
+++ b/openo-portal/portal-common/src/main/webapp/common/json/menu_list.json
@@ -50,12 +50,6 @@
             "url":"../user/user.html",\r
             "iconClass":"fa fa-puzzle-piece"\r
         },\r
-        {\r
-            "parentId":"openo_menu_orchestrator",\r
-            "id":"openo_menu_orchestrator_model_design",\r
-            "url":"/winery/servicetemplates.html",\r
-            "iconClass":"fa fa-folder-open-o"\r
-        },\r
         {\r
             "parentId":"openo_menu_orchestrator",\r
             "id":"openo_menu_orchestrator_package",\r