summaryrefslogtreecommitdiffstats
path: root/openo-portal/portal-catalog/src
diff options
context:
space:
mode:
authornancylizi <li.zi30@zte.com.cn>2016-09-29 19:21:34 +0800
committernancylizi <li.zi30@zte.com.cn>2016-09-29 19:21:34 +0800
commit9c1464b3e4fd75e883b9f6844d8880f6b5c9d45e (patch)
tree7506cfe8662d36ab873555d9e1c578ef83a76ef5 /openo-portal/portal-catalog/src
parentf58cce8d5398868d4d7735f33774b86ffa258d69 (diff)
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 <li.zi30@zte.com.cn>
Diffstat (limited to 'openo-portal/portal-catalog/src')
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/csarPackage.html6
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/package/pmController.js29
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmDetailController.js2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmNodesController.js2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/js/template/tmTopoController.js2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/nodesDetail.html4
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/template.html2
-rw-r--r--openo-portal/portal-catalog/src/main/webapp/catalog/topologyDetail.html4
8 files changed, 27 insertions, 24 deletions
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 @@
</thead>
<tbody ms-each-rest="resource.vimSelectItems">
<tr>
- <td ms-text="rest.vimName"></td>
+ <td ms-text="rest.name"></td>
<td>
<div class="checkbox">
<input type="radio" name="testEnvRadios" ms-attr-id="testEnvRadios{{$index}}"
@@ -277,11 +277,11 @@
<script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootbox/bootbox.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/cometd/cometd.js"></script>
- <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/../common/thirdparty/jquery.ui.widget.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/vendor/jquery.ui.widget.js"></script>
<script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.iframe-transport.js"></script>
<script type="text/javascript" src="../common/thirdparty/jQuery-File-Upload/js/jquery.fileupload.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
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": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+ "sProcessing": "<img src='../common/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+$.i18n.prop("nfv-nso-iui-table-sProcess")+"</span>",
"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": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+ "sProcessing": "<img src='../common/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+ $.i18n.prop("nfv-nso-iui-table-sProcess") + "</span>",
"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": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+ "sProcessing": "<img src='../common/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+$.i18n.prop("nfv-nso-iui-table-sProcess")+"</span>",
"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": "<img src='../component/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+ "sProcessing": "<img src='../common/thirdparty/data-tables/images/loading-spinner-grey.gif'/><span>&nbsp;&nbsp;"
+$.i18n.prop("nfv-nso-iui-table-sProcess")+"</span>",
"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 @@
<script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>
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 @@
<script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootbox/bootbox.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/avalon/avalon.modern.js"></script>
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 @@
<script type="text/javascript" src="../common/thirdparty/jquery/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.js"></script>
- <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables.min.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.js"></script>
+ <script type="text/javascript" src="../common/thirdparty/data-tables/jquery.dataTables-1.9.4.min.js"></script>
<script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>
<script type="text/javascript" src="../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>