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

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.
This commit is contained in:
Shubham Dhama 2019-03-18 15:37:51 +05:30 committed by Tim Abbott
parent 96aac91119
commit 42d19ababe
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
static/js/settings_users.js
View File

@ -14,8 +14,7 @@ function get_user_info_row(user_id) {
return $("tr.user_row[data-user-id='" + user_id + "']"); return $("tr.user_row[data-user-id='" + user_id + "']");
} }
function update_view_on_deactivate() { function update_view_on_deactivate(row) {
var row = meta.current_deactivate_bot_modal_row;
var button = row.find("button.deactivate"); var button = row.find("button.deactivate");
row.find('button.open-user-form').hide(); row.find('button.open-user-form').hide();
button.addClass("btn-warning"); button.addClass("btn-warning");
@ -306,18 +305,17 @@ exports.on_load_success = function (realm_people_data) {
e.stopPropagation(); e.stopPropagation();
var row = $(e.target).closest(".user_row"); var row = $(e.target).closest(".user_row");
meta.current_deactivate_bot_modal_row = row;
meta.current_bot_element = $(e.target); meta.current_bot_element = $(e.target);
var bot_id = row.attr("data-user-id"); var bot_id = row.attr("data-user-id");
var url = '/json/bots/' + encodeURIComponent(bot_id); var url = '/json/bots/' + encodeURIComponent(bot_id);
var data = {
};
var opts = { var opts = {
success_continuation: update_view_on_deactivate, success_continuation: function () {
update_view_on_deactivate(row);
},
error_continuation: update_view_on_deactivate_reactivate_failure, error_continuation: update_view_on_deactivate_reactivate_failure,
}; };
var status = get_status_field(); 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);
}); });