fix: use promises in privilege save

... instead of jQuery Deferreds
v1.18.x
Julian Lam 5 years ago
parent 7a5daff4c9
commit 9cbe9389f5

@ -115,7 +115,7 @@ define('admin/manage/privileges', [
return Privileges.setPrivilege(member, privilege, state); return Privileges.setPrivilege(member, privilege, state);
}); });
$.when(requests).done(function () { Promise.allSettled(requests).then(function () {
Privileges.refreshPrivilegeTable(); Privileges.refreshPrivilegeTable();
app.alertSuccess('[[admin/manage/privileges:alert.saved]]'); app.alertSuccess('[[admin/manage/privileges:alert.saved]]');
}); });
@ -180,8 +180,7 @@ define('admin/manage/privileges', [
}; };
Privileges.setPrivilege = function (member, privilege, state) { Privileges.setPrivilege = function (member, privilege, state) {
var deferred = $.Deferred(); return new Promise(function (resolve, reject) {
socket.emit('admin.categories.setPrivilege', { socket.emit('admin.categories.setPrivilege', {
cid: isNaN(cid) ? 0 : cid, cid: isNaN(cid) ? 0 : cid,
privilege: privilege, privilege: privilege,
@ -189,14 +188,13 @@ define('admin/manage/privileges', [
member: member, member: member,
}, function (err) { }, function (err) {
if (err) { if (err) {
deferred.reject(err); reject(err);
return app.alertError(err.message); return app.alertError(err.message);
} }
deferred.resolve(); resolve();
});
}); });
return deferred.promise();
}; };
Privileges.addUserToPrivilegeTable = function () { Privileges.addUserToPrivilegeTable = function () {

Loading…
Cancel
Save