Commit 4936ebf3 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

hideProcessing wasn't called in the right places

parent d876e838
Pipeline #9138 passed with stage
in 9 minutes and 25 seconds
...@@ -4,6 +4,7 @@ minerva (12.2.0~beta.3) unstable; urgency=medium ...@@ -4,6 +4,7 @@ minerva (12.2.0~beta.3) unstable; urgency=medium
pubmed id triggered exception (#737) pubmed id triggered exception (#737)
* Bug fix: proper id is used in list of publications when publication id is * Bug fix: proper id is used in list of publications when publication id is
invalid (#735) invalid (#735)
* Bug fix: closing Add Project window was taking infinity (#734)
-- Piotr Gawron <piotr.gawron@uni.lu> Wed, 6 Mar 2019 17:00:00 +0200 -- Piotr Gawron <piotr.gawron@uni.lu> Wed, 6 Mar 2019 17:00:00 +0200
......
...@@ -788,10 +788,10 @@ AddProjectDialog.prototype.bindProjectUploadPreferences = function (user, type, ...@@ -788,10 +788,10 @@ AddProjectDialog.prototype.bindProjectUploadPreferences = function (user, type,
var value = user.getPreferences().getProjectUpload()[type]; var value = user.getPreferences().getProjectUpload()[type];
element.prop('checked', value); element.prop('checked', value);
GuiConnector.showProcessing();
element.change(function () { element.change(function () {
var data = new UserPreferences(); var data = new UserPreferences();
data.getProjectUpload()[type] = element.is(":checked"); data.getProjectUpload()[type] = element.is(":checked");
GuiConnector.showProcessing();
return ServerConnector.updateUserPreferences({ return ServerConnector.updateUserPreferences({
user: user, user: user,
preferences: data preferences: data
......
...@@ -344,9 +344,9 @@ MapsAdminPanel.prototype.onAddClicked = function () { ...@@ -344,9 +344,9 @@ MapsAdminPanel.prototype.onAddClicked = function () {
return dialog.open(); return dialog.open();
}); });
} else { } else {
dialog.clear(); return dialog.clear().then(function () {
dialog.open(); return dialog.open();
return Promise.resolve(); })
} }
}; };
...@@ -478,12 +478,9 @@ MapsAdminPanel.prototype.showEditDialog = function (id) { ...@@ -478,12 +478,9 @@ MapsAdminPanel.prototype.showEditDialog = function (id) {
return ServerConnector.getProject(id).then(function (project) { return ServerConnector.getProject(id).then(function (project) {
return self.getDialog(project); return self.getDialog(project);
}).then(function (dialog) { }).then(function (dialog) {
dialog.open(); dialog.open();
}).finally(function () {
GuiConnector.hideProcessing(); GuiConnector.hideProcessing();
}).then(null, function (error) {
GuiConnector.hideProcessing();
return Promise.reject(error);
}); });
}; };
...@@ -498,11 +495,8 @@ MapsAdminPanel.prototype.showLogs = function (id, level) { ...@@ -498,11 +495,8 @@ MapsAdminPanel.prototype.showLogs = function (id, level) {
GuiConnector.showProcessing(); GuiConnector.showProcessing();
return self.getLogDialog(id, level).then(function (dialog) { return self.getLogDialog(id, level).then(function (dialog) {
return dialog.open(); return dialog.open();
}).then(function () { }).finally(function () {
GuiConnector.hideProcessing();
}, function (error) {
GuiConnector.hideProcessing(); GuiConnector.hideProcessing();
return Promise.reject(error);
}); });
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment