Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

admin: Fix Deactivate/Reactivate User Buttons. 

This fixes the behavior to be consistent and remove the “Working…” bug.
This commit is contained in:
Brock Whittaker 2016-12-14 12:30:21 -08:00 committed by Tim Abbott
parent 36319ca501
commit d20e643c59
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
static/js/admin.js
View File

@ -1,5 +1,6 @@
var admin = (function () { var admin = (function () {
var meta = {};
var exports = {}; var exports = {};
var all_streams = []; var all_streams = [];
@ -217,39 +218,7 @@ exports.populate_auth_methods = function (auth_methods) {
}; };
exports.set_up_deactivate_user_modal = function (row) { exports.set_up_deactivate_user_modal = function (row) {
$("#do_deactivate_user_button").expectOne().click(function () { meta.current_deactivate_user_modal_row = row;
var email = row.find(".email").text();
if ($("#deactivation_user_modal .email").html() !== email) {
blueslip.error("User deactivation canceled due to non-matching fields.");
ui.report_message("Deactivation encountered an error. Please reload and try again.",
$("#home-error"), 'alert-error');
}
$("#deactivation_user_modal").modal("hide");
row.find("button").prop("disabled", true).text("Working…");
channel.del({
url: '/json/users/' + email,
error: function (xhr) {
if (xhr.status.toString().charAt(0) === "4") {
row.find("button").closest("td").html(
$("<p>").addClass("text-error").text(JSON.parse(xhr.responseText).msg)
);
} else {
row.find("button").text("Failed!");
}
},
success: function () {
var button = row.find("button.deactivate");
button.prop("disabled", false);
button.addClass("btn-warning");
button.removeClass("btn-danger");
button.addClass("reactivate");
button.removeClass("deactivate");
button.text(i18n.t("Reactivate"));
row.addClass("deactivated_user");
row.find(".user-admin-settings").hide();
}
});
});
}; };
@ -409,6 +378,38 @@ function _setup_page() {
} }
}); });
$("#do_deactivate_user_button").expectOne().click(function () {
var email = meta.current_deactivate_user_modal_row.find(".email").text();
if ($("#deactivation_user_modal .email").html() !== email) {
blueslip.error("User deactivation canceled due to non-matching fields.");
ui.report_message("Deactivation encountered an error. Please reload and try again.",
$("#home-error"), 'alert-error');
}
$("#deactivation_user_modal").modal("hide");
meta.current_deactivate_user_modal_row.find("button").eq(0).prop("disabled", true).text("Working…");
channel.del({
url: '/json/users/' + email,
error: function (xhr) {
if (xhr.status.toString().charAt(0) === "4") {
meta.current_deactivate_user_modal_row.find("button").closest("td").html(
$("<p>").addClass("text-error").text(JSON.parse(xhr.responseText).msg)
);
} else {
meta.current_deactivate_user_modal_row.find("button").text("Failed!");
}
},
success: function () {
var button = meta.current_deactivate_user_modal_row.find("button.deactivate");
button.prop("disabled", false);
button.addClass("btn-warning reactivate").removeClass("btn-danger deactivate");
button.text(i18n.t("Reactivate"));
meta.current_deactivate_user_modal_row.addClass("deactivated_user");
meta.current_deactivate_user_modal_row.find(".user-admin-settings").hide();
}
});
});
$(".admin_bot_table").on("click", ".deactivate", function (e) { $(".admin_bot_table").on("click", ".deactivate", function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -461,6 +462,7 @@ function _setup_page() {
} }
}, },
success: function () { success: function () {
row.find(".user-admin-settings").show();
var button = row.find("button.reactivate"); var button = row.find("button.reactivate");
button.addClass("btn-danger"); button.addClass("btn-danger");
button.removeClass("btn-warning"); button.removeClass("btn-warning");