paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

invites: Add UI for revoking multiuse invites.

Browse Source
This commit is contained in:
Vishnu Ks
2019-02-15 18:09:25 +00:00
committed by Tim Abbott
parent 03dcace09d
commit 763eca6ca9
11 changed files with 188 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
static/js/settings_invites.js
View File

@@ -65,7 +65,12 @@ function populate_invites(invites_data) {
filter: {
element: invites_table.closest(".settings-section").find(".search"),
callback: function (item, value) {
return item.email.toLowerCase().indexOf(value) >= 0;
var referrer_email_matched = item.ref.toLowerCase().indexOf(value) >= 0;
if (item.is_multiuse) {
return referrer_email_matched;
}
var invitee_email_matched = item.email.toLowerCase().indexOf(value) >= 0;
return referrer_email_matched || invitee_email_matched;
},
},
}).init();
@@ -76,17 +81,23 @@ function populate_invites(invites_data) {
function do_revoke_invite() {
var modal_invite_id = $("#revoke_invite_modal #do_revoke_invite_button").attr("data-invite-id");
var modal_is_multiuse = $("#revoke_invite_modal #do_revoke_invite_button").attr("data-is-multiuse");
var revoke_button = meta.current_revoke_invite_user_modal_row.find("button.revoke");
if (modal_invite_id !== meta.invite_id) {
if (modal_invite_id !== meta.invite_id || modal_is_multiuse !== meta.is_multiuse) {
blueslip.error("Invite revoking canceled due to non-matching fields.");
ui_report.message(i18n.t("Resending encountered an error. Please reload and try again."),
$("#home-error"), 'alert-error');
}
$("#revoke_invite_modal").modal("hide");
revoke_button.prop("disabled", true).text(i18n.t("Working…"));
var url = '/json/invites/' + meta.invite_id;
if (modal_is_multiuse === "true") {
url = '/json/invites/multiuse/' + meta.invite_id;
}
channel.del({
url: '/json/invites/' + meta.invite_id,
url: url,
error: function (xhr) {
ui_report.generic_row_button_error(xhr, revoke_button);
},
@@ -96,8 +107,11 @@ function do_revoke_invite() {
});
}
exports.set_up = function () {
exports.set_up = function (initialize_event_handlers) {
meta.loaded = true;
if (typeof initialize_event_handlers === 'undefined') {
initialize_event_handlers = true;
}
// create loading indicators
loading.make_indicator($('#admin_page_invites_loading_indicator'));
@@ -107,29 +121,38 @@ exports.set_up = function () {
url: '/json/invites',
idempotent: true,
timeout: 10 * 1000,
success: exports.on_load_success,
success: function (data) {
exports.on_load_success(data, initialize_event_handlers);
},
error: failed_listing_invites,
});
};
exports.on_load_success = function (invites_data) {
exports.on_load_success = function (invites_data, initialize_event_handlers) {
meta.loaded = true;
populate_invites(invites_data);
if (!initialize_event_handlers) {
return;
}
$(".admin_invites_table").on("click", ".revoke", function (e) {
// This click event must not get propagated to parent container otherwise the modal
// will not show up because of a call to `close_active_modal` in `settings.js`.
e.preventDefault();
e.stopPropagation();
var row = $(e.target).closest(".invite_row");
var email = row.find('.email').text();
var referred_by = row.find('.referred_by').text();
meta.current_revoke_invite_user_modal_row = row;
meta.invite_id = $(e.currentTarget).attr("data-invite-id");
$("#revoke_invite_modal .email").text(email);
meta.is_multiuse = $(e.currentTarget).attr("data-is-multiuse");
var ctx = {is_multiuse: meta.is_multiuse === "true", email: email, referred_by: referred_by};
var rendered_revoke_modal = templates.render("revoke-invite-modal", ctx);
$("#revoke_invite_modal_holder").html(rendered_revoke_modal);
$("#revoke_invite_modal #do_revoke_invite_button").attr("data-invite-id", meta.invite_id);
$("#revoke_invite_modal #do_revoke_invite_button").attr("data-is-multiuse", meta.is_multiuse);
$("#revoke_invite_modal").modal("show");
$("#do_revoke_invite_button").unbind("click");
$("#do_revoke_invite_button").click(do_revoke_invite);
});
$(".admin_invites_table").on("click", ".resend", function (e) {
@@ -148,8 +171,6 @@ exports.on_load_success = function (invites_data) {
$("#resend_invite_modal").modal("show");
});
$("#do_revoke_invite_button").click(do_revoke_invite);
$("#do_resend_invite_button").click(function () {
var modal_invite_id = $("#resend_invite_modal #do_resend_invite_button").attr("data-invite-id");
var resend_button = meta.current_resend_invite_user_modal_row.find("button.resend");