eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qingwz...@apache.org
Subject eagle git commit: [EAGLE-1054] Publisher delete don't close the dialog
Date Wed, 21 Jun 2017 02:46:03 GMT
Repository: eagle
Updated Branches:
  refs/heads/master ffbcfb372 -> a4f953516


[EAGLE-1054] Publisher delete don't close the dialog

https://issues.apache.org/jira/browse/EAGLE-1054

When user delete the publisher. The dialog not closed.

Author: zombieJ <smith3816@gmail.com>

Closes #956 from zombieJ/EAGLE-1054.


Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/a4f95351
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/a4f95351
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/a4f95351

Branch: refs/heads/master
Commit: a4f953516248df6eccb65014c712f385a36e3d26
Parents: ffbcfb3
Author: zombieJ <smith3816@gmail.com>
Authored: Wed Jun 21 10:45:57 2017 +0800
Committer: Zhao, Qingwen <qingwzhao@apache.org>
Committed: Wed Jun 21 10:45:57 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/eagle/blob/a4f95351/eagle-server/src/main/webapp/app/dev/public/js/ctrls/integrationCtrl.js
----------------------------------------------------------------------
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 5aa7036..d4e57d1 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();
 				});
 			});
 		};

http://git-wip-us.apache.org/repos/asf/eagle/blob/a4f95351/eagle-server/src/main/webapp/app/dev/public/js/services/entitySrv.js
----------------------------------------------------------------------
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 54b3694..2978a35 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)
 			};
 		};
 


Mime
View raw message