From 7988e9a2d476f25a8b556980b1cad6f0c2db982b Mon Sep 17 00:00:00 2001
From: zombieJ <smith3816@gmail.com>
Date: Wed, 21 Jun 2017 10:13:52 +0800
Subject: [PATCH] adjust delete logic

---
 .../main/webapp/app/dev/public/js/ctrls/integrationCtrl.js | 7 ++++---
 .../main/webapp/app/dev/public/js/services/entitySrv.js    | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
index 5aa7036673..d4e57d12de 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
@@ -496,10 +496,8 @@
 			$event.stopPropagation();
 
 			UI.deleteConfirm(publisher.name)(function (entity, closeFunc) {
-				Entity.deleteMetadata("publishments/" + publisher.name)._promise.finally(function (res) {
+				Entity.deleteMetadata("publishments/" + publisher.name)._promise.then(function (res) {
 					var data = res.data;
-					closeFunc();
-					refreshPublishList();
 
 					if (data.code !== 200) {
 						$.dialog({
@@ -507,6 +505,9 @@
 							content: data.message,
 						});
 					}
+				}).finally(function () {
+					closeFunc();
+					refreshPublishList();
 				});
 			});
 		};
diff --git a/eagle-server/src/main/webapp/app/dev/public/js/services/entitySrv.js b/eagle-server/src/main/webapp/app/dev/public/js/services/entitySrv.js
index 54b369451b..2978a35e54 100644
--- a/eagle-server/src/main/webapp/app/dev/public/js/services/entitySrv.js
+++ b/eagle-server/src/main/webapp/app/dev/public/js/services/entitySrv.js
@@ -148,9 +148,7 @@
 
 		Entity.deleteMetadata = function (url) {
 			return {
-				_promise: $authHttp.delete(_host + "/rest/metadata/" + url).then(function (res) {
-					console.log(res);
-				})
+				_promise: $authHttp.delete(_host + "/rest/metadata/" + url)
 			};
 		};