[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.
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();
});
});
};
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)
};
};
