Modify the alert message while delete package.

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

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
index 5e9b97b..7c2d130 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-en-US.properties
@@ -89,6 +89,9 @@ nfv-package-iui-message-select-vim-error = Can not select more than one VIM to b
 nfv-package-iui-onboard-dialog-vimname = VIM Name\r
 nfv-package-iui-product-env = Product Environment\r
 nfv-package-iui-test-env = Test Environment\r
+nfv-package-iui-http-delete-error = Delete package from HTTP server failed!\r
+nfv-package-iui-template-delete-error = Delete template data failed!\r
+nfv-package-iui-package-delete-error = Delete package data failed!\r
 \r
 nfv-package-iui-drop-zone-title=Drag & drop files here …\r
 nfv-package-iui-drop-zone-selectBtn=Browse\r

diff --git a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
index efb1916..1d3e6cf 100644 (file)
--- a/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
+++ b/openo-portal/portal-catalog/src/main/webapp/catalog/i18n/nfv-nso-iui-i18n-zh-CN.properties
@@ -90,6 +90,9 @@ nfv-package-iui-message-select-vim-error = 最多只能选择一个VIM做为测
 nfv-package-iui-onboard-dialog-vimname = VIM名称\r
 nfv-package-iui-product-env = 生产环境\r
 nfv-package-iui-test-env = 测试环境\r
+nfv-package-iui-http-delete-error = 从HTTP服务器上删除包失败!\r
+nfv-package-iui-template-delete-error = 删除模板数据失败!\r
+nfv-package-iui-package-delete-error = 删除包数据失败!\r
 \r
 \r
 nfv-package-iui-drop-zone-title=拖拽文件到这里 …\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 80067ab..db21456 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
@@ -71,8 +71,18 @@ pmUtil.updateDeletedPackageStatus = function(message) {
     if(messageobj.status == "true" || messageobj.status == "deletionPending") {\r
         commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
         refreshByCond();\r
-    } else {\r
+    } else if (messageobj.status == "Delete package from HTTP server failed!") {\r
         pmUtil.changeTableStatus(messageobj.csarid, "deletefail");\r
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-http-delete-error"), "failed");\r
+    } else if (messageobj.status == "Delete template data failed!") {\r
+        pmUtil.changeTableStatus(messageobj.csarid, "deletefail");\r
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-template-delete-error"), "failed");\r
+    } else if (messageobj.status == "Delete package data failed!") {\r
+        pmUtil.changeTableStatus(messageobj.csarid, "deletefail");\r
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-package-delete-error"), "failed");\r
+    } else if (messageobj.status == "false") {\r
+        pmUtil.changeTableStatus(messageobj.csarid, "deletefail");\r
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-error"), "failed");\r
     }\r
 }\r
 \r
@@ -168,15 +178,11 @@ pmUtil.delPackage = function (url) {
         url : url,\r
         contentType : "application/json",\r
         success : function(resp) {\r
-            //commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
-            //setTimeout( function(){\r
-            //    refreshByCond();\r
-            //}, 1 * 1000 );\r
+           \r
         },\r
         error : function(resp) {\r
             if(resp.status == 202 || resp.responseText == "success") {\r
-                //commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");\r
-                //refreshByCond();\r
+\r
             } else {\r
                 commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-error"), "failed");\r
                 refreshByCond();\r
@@ -185,6 +191,18 @@ pmUtil.delPackage = function (url) {
     });\r
 }\r
 \r
+pmUtil.isRowDeletingStatus = function(csarId) {\r
+    var table = $("#" + vm.$tableId).dataTable();\r
+    var tableData = table.fnGetData();\r
+    for (var i=0; i<tableData.length; i++) {\r
+        if(tableData[i]["csarId"] == csarId && \r
+           tableData[i]["status"].indexOf($.i18n.prop("nfv-package-iui-status-deleting")) > -1) {\r
+            return true;            \r
+        }\r
+    }\r
+    return false;\r
+}\r
+\r
 pmUtil.nameRender = function(obj) {\r
     return '<a href="#" onclick="vm.packageDetail.$showDetails('\r
         + '\'block\',\'' + obj.aData.csarId + '\', \'' + obj.aData.name + '\')">' + obj.aData.name + '</a>';\r