From 42d19ababeb4664bb8ae90c4f27b36dba393f93b Mon Sep 17 00:00:00 2001 From: Shubham Dhama Date: Mon, 18 Mar 2019 15:37:51 +0530 Subject: [PATCH] settings_users: Fix update_view_on_deactivate to take row as an argument. We should pass row as an argument to update_view_on_deactivate because we update deactivate view of a row when the user get activated/deactivated by the event system. This also removes a redundant data variable. --- static/js/settings_users.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/static/js/settings_users.js b/static/js/settings_users.js index e0bf87dd25..ed8535659d 100644 --- a/static/js/settings_users.js +++ b/static/js/settings_users.js @@ -14,8 +14,7 @@ function get_user_info_row(user_id) { return $("tr.user_row[data-user-id='" + user_id + "']"); } -function update_view_on_deactivate() { - var row = meta.current_deactivate_bot_modal_row; +function update_view_on_deactivate(row) { var button = row.find("button.deactivate"); row.find('button.open-user-form').hide(); button.addClass("btn-warning"); @@ -306,18 +305,17 @@ exports.on_load_success = function (realm_people_data) { e.stopPropagation(); var row = $(e.target).closest(".user_row"); - meta.current_deactivate_bot_modal_row = row; meta.current_bot_element = $(e.target); var bot_id = row.attr("data-user-id"); var url = '/json/bots/' + encodeURIComponent(bot_id); - var data = { - }; var opts = { - success_continuation: update_view_on_deactivate, + success_continuation: function () { + update_view_on_deactivate(row); + }, error_continuation: update_view_on_deactivate_reactivate_failure, }; var status = get_status_field(); - settings_ui.do_settings_change(channel.del, url, data, status, opts); + settings_ui.do_settings_change(channel.del, url, {}, status, opts); });