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

settings: Fix incorrectly resolved merge conflict.

Browse Source 
In 7b4f7b4a85, we replaced
do_settings_change the dialog_widget.send_api_request.

When 0a278c39d2 was rebased past that
change, the merge conflict was resolved incorrectly, resulting in
duplicate API requests.
This commit is contained in:
Tim Abbott
2022-09-01 14:29:09 -07:00
parent 4303ba1efc
commit 43a57494f9
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
static/js/settings_users.js
View File

@@ -21,7 +21,6 @@ import * as settings_bots from "./settings_bots";
import * as settings_config from "./settings_config"; import * as settings_config from "./settings_config";
import * as settings_data from "./settings_data"; import * as settings_data from "./settings_data";
import * as settings_panel_menu from "./settings_panel_menu"; import * as settings_panel_menu from "./settings_panel_menu";
import * as settings_ui from "./settings_ui";
import * as timerender from "./timerender"; import * as timerender from "./timerender";
import * as ui from "./ui"; import * as ui from "./ui";
import * as user_pill from "./user_pill"; import * as user_pill from "./user_pill";
@@ -483,8 +482,6 @@ function handle_deactivation($tbody) {
function handle_confirm() { function handle_confirm() {
const url = "/json/users/" + encodeURIComponent(user_id); const url = "/json/users/" + encodeURIComponent(user_id);
dialog_widget.submit_api_request(channel.del, url);
let data = {}; let data = {};
if ($(".send_email").is(":checked")) { if ($(".send_email").is(":checked")) {
data = { data = {
@@ -492,9 +489,7 @@ function handle_deactivation($tbody) {
}; };
} }
const $status_field = $("#admin-user-list .alert-notification"); dialog_widget.submit_api_request(channel.del, url, data);
settings_ui.do_settings_change(channel.del, url, data, $status_field);
} }
confirm_deactivation(user_id, handle_confirm, true); confirm_deactivation(user_id, handle_confirm, true);