1 files changed, 25 insertions, 7 deletions
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 80067abc..db21456f 100644
--- 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") {
         commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");
         refreshByCond();
-    } else {
+    } else if (messageobj.status == "Delete package from HTTP server failed!") {
         pmUtil.changeTableStatus(messageobj.csarid, "deletefail");
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-http-delete-error"), "failed");
+    } else if (messageobj.status == "Delete template data failed!") {
+        pmUtil.changeTableStatus(messageobj.csarid, "deletefail");
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-template-delete-error"), "failed");
+    } else if (messageobj.status == "Delete package data failed!") {
+        pmUtil.changeTableStatus(messageobj.csarid, "deletefail");
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-package-delete-error"), "failed");
+    } else if (messageobj.status == "false") {
+        pmUtil.changeTableStatus(messageobj.csarid, "deletefail");
+        commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-error"), "failed");
     }
 }
 
@@ -168,15 +178,11 @@ pmUtil.delPackage = function (url) {
         url : url,
         contentType : "application/json",
         success : function(resp) {
-            //commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");
-            //setTimeout( function(){
-            //    refreshByCond();
-            //}, 1 * 1000 );
+           
         },
         error : function(resp) {
             if(resp.status == 202 || resp.responseText == "success") {
-                //commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-success"), "success");
-                //refreshByCond();
+
             } else {
                 commonUtil.showMessage($.i18n.prop("nfv-package-iui-message-delete-error"), "failed");
                 refreshByCond();
@@ -185,6 +191,18 @@ pmUtil.delPackage = function (url) {
     });
 }
 
+pmUtil.isRowDeletingStatus = function(csarId) {
+    var table = $("#" + vm.$tableId).dataTable();
+    var tableData = table.fnGetData();
+    for (var i=0; i<tableData.length; i++) {
+        if(tableData[i]["csarId"] == csarId && 
+           tableData[i]["status"].indexOf($.i18n.prop("nfv-package-iui-status-deleting")) > -1) {
+            return true;            
+        }
+    }
+    return false;
+}
+
 pmUtil.nameRender = function(obj) {
     return '<a href="#" onclick="vm.packageDetail.$showDetails('
         + '\'block\',\'' + obj.aData.csarId + '\', \'' + obj.aData.name + '\')">' + obj.aData.name + '</a>';