From 9c1464b3e4fd75e883b9f6844d8880f6b5c9d45e Mon Sep 17 00:00:00 2001 From: nancylizi Date: Thu, 29 Sep 2016 19:21:34 +0800 Subject: Modify the bug in package manager. Modify the bug which caused by dataTables version. Issue-id:TOSCA-90 TOSCA-92 Change-Id: I04f61db30f7add159d71886e352480fdf15282ca Signed-off-by: nancylizi --- .../src/main/webapp/catalog/csarPackage.html | 6 ++--- .../main/webapp/catalog/js/package/pmController.js | 29 ++++++++++++---------- .../catalog/js/template/tmDetailController.js | 2 +- .../catalog/js/template/tmNodesController.js | 2 +- .../webapp/catalog/js/template/tmTopoController.js | 2 +- .../src/main/webapp/catalog/nodesDetail.html | 4 +-- .../src/main/webapp/catalog/template.html | 2 +- .../src/main/webapp/catalog/topologyDetail.html | 4 +-- 8 files changed, 27 insertions(+), 24 deletions(-) (limited to 'openo-portal/portal-catalog/src') diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html index e3a19da9..827f13e7 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html @@ -226,7 +226,7 @@ - +
- + - + 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 023e08d3..974bac61 100644 --- 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 @@ -18,10 +18,7 @@ var vm = avalon.define({ resource : { packageInfo : [], packageDetails : "", - vimSelectItems : [ - {vimName:"test1", oid:"123456"}, - {vimName:"test2",oid:"987654"} - ] + vimSelectItems : [] }, csarIdSelected : "", $packageTableFields : {// table columns @@ -35,7 +32,7 @@ var vm = avalon.define({ ] }, $language: { - "sProcessing": "  " + "sProcessing": "  " +$.i18n.prop("nfv-nso-iui-table-sProcess")+"", "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"), "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"), @@ -63,7 +60,7 @@ var vm = avalon.define({ nsarOnboardUrl: "/openoapi/nslcm/v1.0/nspackage", nfarOnboardUrl: "/openoapi/nslcm/v1.0/vnfpackage", changePackageStatusUrl : "/openoapi/catalog/v1/csars", - queryVimInfoUrl : "/api/roc/v1/resource/vims" + queryVimInfoUrl : "/openoapi/extsys/v1/vims" }, $getPackageCond: function() { var cond = {}; @@ -133,11 +130,17 @@ var vm = avalon.define({ labVimId : "", }, $initData : function(csarId) { - vm.resource.vimSelectItems = [ - {vimName:"test1", oid:"123456"}, - {vimName:"test2", oid:"987654"}, - {vimName:"test3", oid:"123qwe"} - ]; + //vm.resource.vimSelectItems = [ + // {vimName:"test1", oid:"123456"}, + // {vimName:"test2", oid:"987654"}, + // {vimName:"test3", oid:"123qwe"} + //]; + var url=vm.$restUrl.queryVimInfoUrl; + commonUtil.get(url,null,function(resp) { + if (resp) { + vm.resource.vimSelectItems=resp; + } + }) vm.selectVimDialog.nfarOnBoardParam.csarId = csarId; }, $confirmBtnClick : function () { @@ -148,10 +151,10 @@ var vm = avalon.define({ var radioId = "testEnvRadios" + i; var checkboxId = "produceEnvChecks" + i; if(document.getElementById(radioId).checked) { - labVimId = vm.resource.vimSelectItems[i].oid; + labVimId = vm.resource.vimSelectItems[i].vimId; } if(document.getElementById(checkboxId).checked) { - vimIds.push(vm.resource.vimSelectItems[i].oid); + vimIds.push(vm.resource.vimSelectItems[i].vimId); } } vm.selectVimDialog.nfarOnBoardParam.labVimId = labVimId; diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js index 9360b5ef..4db377ef 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js @@ -21,7 +21,7 @@ var vm = avalon.define({ {href: "#nodes", name: "Nodes", value: false} ], $language: { - "sProcessing": "  " + "sProcessing": "  " + $.i18n.prop("nfv-nso-iui-table-sProcess") + "", "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"), "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"), diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js index d078d1bc..b6f554f9 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js @@ -17,7 +17,7 @@ var vm = avalon.define({ $id : "tmNodesController", templateId : "", $language: { - "sProcessing": "  " + "sProcessing": "  " +$.i18n.prop("nfv-nso-iui-table-sProcess")+"", "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"), "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"), diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js index a4168e9a..d5977cea 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js @@ -18,7 +18,7 @@ var vm = avalon.define({ templateId : "", nodesData: [], $language: { - "sProcessing": "  " + "sProcessing": "  " +$.i18n.prop("nfv-nso-iui-table-sProcess")+"", "sLengthMenu": $.i18n.prop("nfv-nso-iui-table-sLengthMenu"), "sZeroRecords": $.i18n.prop("nfv-nso-iui-table-sZeroRecords"), diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html index aa53f8fc..5a7abc5b 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html @@ -86,8 +86,8 @@ - - + + diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/template.html b/openo-portal/portal-catalog/src/main/webapp/catalog/template.html index f8df8235..b9e43898 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/template.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/template.html @@ -53,7 +53,7 @@ - + diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html b/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html index 9343f4df..b29a4162 100644 --- a/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html +++ b/openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html @@ -188,8 +188,8 @@ - - + + -- cgit 1.2.3-korg