paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 02:17:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

deactivation-stream-modal: Make stream name a template variable.

Browse Source 
In stream deactivation modal, make "stream_name" a template variable,
rather than patching stream name to modal header in javascript.
Add tests for deactivation stream modal.
This commit is contained in:
YJDave
2018-02-21 09:46:45 +05:30
committed by Tim Abbott
parent 8ba91e48c1
commit d36ec962bb
5 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
static/js/settings_streams.js
View File

@@ -129,8 +129,9 @@ exports.set_up = function () {
row.addClass("active_stream_row");
var stream_name = row.find('.stream_name').text();
var deactivate_stream_modal = templates.render('deactivation-stream-modal', {stream_name: stream_name});
$("#settings_content .organization-box").append(deactivate_stream_modal);
$("#deactivation_stream_modal .stream_name").text(stream_name);
overlays.open_modal('deactivation_stream_modal');
});
@@ -167,19 +168,24 @@ exports.set_up = function () {
default_stream_input[0].value = "";
});
$("#do_deactivate_stream_button").click(function () {
$("#settings_content").on("click", "#do_deactivate_stream_button", function () {
if ($("#deactivation_stream_modal .stream_name").text() !== $(".active_stream_row").find('.stream_name').text()) {
blueslip.error("Stream deactivation canceled due to non-matching fields.");
ui_report.message(i18n.t("Deactivation encountered an error. Please reload and try again."),
$("#home-error"), 'alert-error');
}
overlays.close_modal('deactivation_stream_modal');
$("#deactivation_stream_modal").remove();
$(".active_stream_row button").prop("disabled", true).text(i18n.t("Working…"));
var stream_name = $(".active_stream_row").find('.stream_name').text();
var stream_id = stream_data.get_sub(stream_name).stream_id;
var row = $(".active_stream_row");
exports.delete_stream(stream_id, $("#organization-status"), row);
});
$("#settings_content").on("hide.bs.modal", "#deactivation_stream_modal", function () {
$("#deactivation_stream_modal").remove();
});
};
exports.delete_stream = function (stream_id, alert_element, stream_row) {