TOSCA-85 Resolve the problem that the value of the version attribute can not show...

Change-Id: I63182f2cf0475a71d271cc66eb40733fcdb266f6
Issue-id:TOSCA-85
Signed-off-by: sunqi310 <sun.qi310@zte.com.cn>

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
index e37a048..bd96468 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/loadi18nApp.js
@@ -17,15 +17,14 @@ function loadPropertiesSideMenu(lang, propertiesFileNamePrefix, propertiesFilePa
     jQuery.i18n.properties({\r
         language: lang,\r
         name: propertiesFileNamePrefix,\r
-        path: propertiesFilePath, // 资源文件路径\r
-        mode: 'map', // 用 Map 的方式使用资源文件中的值\r
-        callback: function () {// 加载成功后设置显示内容\r
+        path: propertiesFilePath, // resource path\r
+        mode: 'map', \r
+        callback: function () {\r
             var i18nItems = $('[name_i18n=com_zte_conductor_ui_i18n]');\r
             for (var i = 0; i < i18nItems.length; i++) {\r
                 var $item = $(i18nItems.eq(i));\r
                 var itemId = $item.attr('id_i18n');\r
-                var itemTitle = $item.attr('title');\r
-                /** id存在时元素内容需要国际化，title存在时元素title需要国际化 */\r
+                var itemTitle = $item.attr('title');                \r
                 if (typeof($item.attr("title")) == "string") {\r
                     $item.attr("title", ($.i18n.prop(itemTitle)));\r
                 }\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
index 8a7e637..70d2225 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/i18n/roc-vim-iui-i18n-en-US.properties
@@ -35,8 +35,8 @@ com_zte_ums_eco_roc_vim_total=Total
 com_zte_ums_eco_roc_vim_metric=vims\r
 com_zte_ums_eco_roc_vim_register_info=Register\r
 com_zte_ums_eco_roc_vim_modify_info=Modify\r
-com_zte_ums_eco_roc_vim_domain=domain \r
-com_zte_ums_eco_roc_vim_description=description  \r
+com_zte_ums_eco_roc_vim_domain=Domain \r
+com_zte_ums_eco_roc_vim_description=Description  \r
 ############## js  ######################\r
 com_zte_ums_eco_roc_vim_auth_url_require_message=please input auth url\r
 com_zte_ums_eco_roc_vim_auth_url_alarm_message=example: http://xx.xx.xx.xx:5000/v2.0\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
index 0a2b097..255d39a 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChart.js
@@ -23,8 +23,7 @@ var labelTop = {
             position: 'outer',\r
             formatter: function (params) {\r
                 var total = params.series.data[1].value + params.series.data[0].value;\r
-                var util = params.series.data[0].util;\r
-                // return total+util+"中的"+"\n"+params.value+util+"已使用" ;\r
+                var util = params.series.data[0].util;                \r
                 return $.i18n.prop('com_zte_ums_eco_roc_vim_resource_chart_used') + params.value + util + "\n" +\r
                     $.i18n.prop('com_zte_ums_eco_roc_vim_resource_chart_total') + total + util;\r
             },\r
@@ -175,7 +174,7 @@ vimChart.vimPieChart = function (data) {
     };\r
 \r
 \r
-    // 为echarts对象加载数据 \r
+     \r
     vimPieChart.hideLoading();\r
     vimPieChart.setOption(option);\r
     window.onresize = vimPieChart.resize;\r
@@ -411,7 +410,7 @@ vimChart.tenantPieChart = function (data) {
     };\r
 \r
 \r
-    // 为echarts对象加载数据 \r
+  \r
     tenantPieChart.hideLoading();\r
     tenantPieChart.setOption(option);\r
     window.onresize = tenantPieChart.resize;\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
index 17f8e05..dc9f3ad 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimChartController.js
@@ -33,7 +33,7 @@ var vm = avalon
         },\r
         initChart: function () {\r
 \r
-            //判断租户是否有admin权限\r
+            //has admin role\r
             var tenantRoleUrl = vm.$tenantRoleUrl.replace("{vim_id}", vm.vimInfo.id);\r
             $.ajax({\r
                 "type": 'get',\r
@@ -49,16 +49,16 @@ var vm = avalon
                 complete: function () {\r
                     if (vm.vimInfo.isAdmin == true) {\r
 \r
-                        //获取全部资源使用情况 \r
+                        //get all resource \r
                         vm.vimChartLoad();\r
 \r
-                        //获取租户列表\r
+                        //get tenant list\r
                         vm.vimListLoad();\r
                     }\r
 \r
                 }\r
             });\r
-            //获取租户资源使用情况 \r
+            //get resource of tenant \r
             vm.tenantChartLoad();\r
         },\r
         gotoVimPage: function () {\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
index 967eb1c..dfeb5dd 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/js/vimController.js
@@ -37,10 +37,10 @@ var vm = avalon
         },\r
         isSave: true,\r
         action: {ADD: 'add', UPDATE: 'update'},\r
-        $queryVimInfoUrl: '../../openoapi/extsys/v1/vims',\r
-        $addVimInfoUrl: '../../openoapi/extsys/v1/vims/',\r
-        $updateVimInfoUrl: '../../openoapi/extsys/v1/vims/',\r
-        $delVimInfoUrl: '../../openoapi/extsys/v1/vims/{vim_id}',\r
+        $queryVimInfoUrl: '/openoapi/extsys/v1/vims',\r
+        $addVimInfoUrl: '/openoapi/extsys/v1/vims/',\r
+        $updateVimInfoUrl: '/openoapi/extsys/v1/vims/',\r
+        $delVimInfoUrl: '/openoapi/extsys/v1/vims/{vim_id}',\r
         $initTable: function () {\r
             $.ajax({\r
                 "type": 'get',\r
@@ -94,7 +94,8 @@ var vm = avalon
             saveType: "add",\r
             description: "",\r
             vimType: "openstack",\r
-            vendor: ""\r
+            vendor: "",\r
+            version: ""\r
         },\r
         $showVimTable: function (el, action) {\r
             vm.isSave = false;\r
@@ -125,6 +126,7 @@ var vm = avalon
                 vm.addVim.titleName = $.i18n.prop('com_zte_ums_eco_roc_vim_modify_info');\r
                 vm.addVim.vimType = el.type;\r
                 vm.addVim.vendor = el.vendor;\r
+                vm.addVim.version = el.version;\r
             }\r
             vm.executeError.visible = false;\r
             vm.executeWait.visible = false;\r
@@ -146,8 +148,7 @@ var vm = avalon
             }\r
             vm.executeWait.visible = true;\r
             vm.executeError.visible = false;\r
-            if (vm.addVim.saveType == "add") {\r
-                //不能重复添加\r
+            if (vm.addVim.saveType == "add") {               \r
                 /*\r
                  for( var i = 0; i < vm.vimInfo.length; i ++ ){\r
                  if(vm.addVim.url == vm.vimInfo[i].url){\r
@@ -162,7 +163,7 @@ var vm = avalon
                 vm.updateVim();\r
             }\r
         },\r
-        //新增vim\r
+        //add vim\r
         persistVim: function () {\r
             $.ajax({\r
                 type: "Post",\r
@@ -208,7 +209,7 @@ var vm = avalon
                 }\r
             });\r
         },\r
-        //更新vim\r
+        //update vim\r
         updateVim: function () {\r
             $.ajax({\r
                 type: "Put",\r
@@ -242,6 +243,8 @@ var vm = avalon
                                 vm.vimInfo[i].domain = vm.addVim.domain;\r
                                 vm.vimInfo[i].description = vm.addVim.description;\r
                                 vm.vimInfo[i].type = vm.addVim.vimType;\r
+                                vm.vimInfo[i].version=vm.addVim.version;\r
+                                vm.vimInfo[i].vendor=vm.addVim.vendor;\r
                             }\r
                         }\r
                         $('#addVimDlg').modal('hide');\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
index 5198724..7bc5591 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vim/vimView.html
@@ -249,16 +249,16 @@
 <script type="text/javascript" src="../../common/js/tools.js"></script>\r
 <script type="text/javascript" src="../../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
 <script type="text/javascript" src="../../common/js/json2.js"></script>\r
-<script type="text/javascript" src="../../common/thirdparty/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
+<script type="text/javascript" src="../../common/thirdparty/bootstrap/js/bootstrap.min.js"></script>\r
 <script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/jquery.validate.js"></script>\r
 <script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/additional-methods.min.js"></script>\r
 <script type="text/javascript" src="../../common/thirdparty/bootbox/bootbox.min.js"></script>\r
 <!--<script type="text/javascript" src="../component/thirdparty/cometd/cometd.js"></script>-->\r
 <!--<script type="text/javascript" src="../component/thirdparty/cometd/jquery/jquery.cometd.js"></script>-->\r
-<script type="text/javascript" src="js/loadi18nApp.js"></script>\r
+<script type="text/javascript" src="i18n/loadi18nApp.js"></script>\r
 <script type="text/javascript" src="js/vim-validate.js"></script>\r
 <!--<script type="text/javascript" src="./js/client-cometd.js"></script>-->\r
-<script src="../vendor/avalon/avalon.js"></script>\r
+<script src="../../common/thirdparty/avalon/avalon.js"></script>\r
 <script type="text/javascript" src="js/vimUtil.js"></script>\r
 <script type="text/javascript" src="js/vimController.js"></script>\r
 <script src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>\r

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
index aed3e34..cea2622 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -35,7 +35,7 @@ nfv-vnfm-iui-text-certificateUrl=certificate URL
 nfv-vnfm-iui-text-vendor=Vendor
 nfv-vnfm-iui-text-userName=Username
 nfv-vnfm-iui-text-password=Password
-nfv-vnfm-iui-text_description=description
+nfv-vnfm-iui-text_description=Description
 nfv-vnfm-iui-text-cancelBtn=cancel
 nfv-vnfm-iui-text-saveBtn=save
 nfv-vnfm-iui-text-registerBtn=Register

diff --git a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
index 1a8053e..c5b7cf3 100644 (file)
--- a/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
+++ b/openo-portal/portal-extsys/src/main/webapp/extsys/vnfm/vnfmView.html
@@ -225,8 +225,8 @@
 <script type="text/javascript" src="../../common/thirdparty/jquery-validation/js/additional-methods.min.js"></script>\r
 \r
 <script type="text/javascript" src="../../common/thirdparty/bootstrap-growl/bootstrap-growl.min.js"></script>\r
-<script type="text/javascript" src="../../common/thirdparty/cometd/cometd.js"></script>\r
-<script type="text/javascript" src="../../common/thirdparty/cometd/jquery.cometd.js"></script>\r
+<!--<script type="text/javascript" src="../../common/thirdparty/cometd/cometd.js"></script>-->\r
+<!--<script type="text/javascript" src="../../common/thirdparty/cometd/jquery.cometd.js"></script>-->\r
 <script type="text/javascript" src="../../common/thirdparty/avalon/avalon.js"></script>\r
 \r
 <script type="text/javascript" src="../../common/js/tools.js"></script>\r