paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-07 15:33:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

admin.js: Refactor code to change view on bot deactivate/reactivate.

Browse Source 
This also fixes the error associated with view on toggle deactivation.
Now, on deactivating a bot, the bot-name and bot-email should strike-out.
And on reactivating a bot, the bot-name and bot-email should remove strike-out.
Toggle edit button on bot activation/deactivation.
Fixes #3413.
This commit is contained in:
Raghav Jajodia
2017-03-16 17:01:03 +05:30
committed by Tim Abbott
parent ecea8c2d43
commit 89a83f6a5d
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
static/js/admin.js
View File

@@ -30,6 +30,29 @@ function get_email_for_user_row(row) {
return email; return email;
} }
function update_view_on_deactivate(row) {
var button = row.find("button.deactivate");
row.find('button.open-user-form').hide();
button.addClass("btn-warning");
button.removeClass("btn-danger");
button.addClass("reactivate");
button.removeClass("deactivate");
button.text(i18n.t("Reactivate"));
row.addClass("deactivated_user");
}
function update_view_on_reactivate(row) {
row.find(".user-admin-settings").show();
var button = row.find("button.reactivate");
row.find("button.open-user-form").show();
button.addClass("btn-danger");
button.removeClass("btn-warning");
button.addClass("deactivate");
button.removeClass("reactivate");
button.text(i18n.t("Deactivate"));
row.removeClass("deactivated_user");
}
exports.update_user_data = function (user_id, new_data) { exports.update_user_data = function (user_id, new_data) {
if (!meta.loaded) { if (!meta.loaded) {
return; return;
@@ -502,6 +525,7 @@ function _setup_page() {
button.addClass("btn-warning reactivate").removeClass("btn-danger deactivate"); button.addClass("btn-warning reactivate").removeClass("btn-danger deactivate");
button.text(i18n.t("Reactivate")); button.text(i18n.t("Reactivate"));
meta.current_deactivate_user_modal_row.addClass("deactivated_user"); meta.current_deactivate_user_modal_row.addClass("deactivated_user");
meta.current_deactivate_user_modal_row.find('button.open-user-form').hide();
meta.current_deactivate_user_modal_row.find(".user-admin-settings").hide(); meta.current_deactivate_user_modal_row.find(".user-admin-settings").hide();
}, },
}); });
@@ -527,13 +551,7 @@ function _setup_page() {
} }
}, },
success: function () { success: function () {
var button = row.find("button.deactivate"); update_view_on_deactivate(row);
button.addClass("btn-warning");
button.removeClass("btn-danger");
button.addClass("reactivate");
button.removeClass("deactivate");
button.text(i18n.t("Reactivate"));
row.addClass("deactivated_user");
}, },
}); });
}); });
@@ -559,14 +577,7 @@ function _setup_page() {
} }
}, },
success: function () { success: function () {
row.find(".user-admin-settings").show(); update_view_on_reactivate(row);
var button = row.find("button.reactivate");
button.addClass("btn-danger");
button.removeClass("btn-warning");
button.addClass("deactivate");
button.removeClass("reactivate");
button.text(i18n.t("Deactivate"));
row.removeClass("deactivated_user");
}, },
}); });
}); });

12
static/templates/admin_user_list.handlebars
View File

@@ -1,5 +1,5 @@
{{#with user}} {{#with user}}
<tr class="user_row" data-user-id="{{user_id}}" data-email="{{email}}"> <tr class="user_row{{#unless is_active}} deactivated_user{{/unless}}" data-user-id="{{user_id}}" data-email="{{email}}">
<td> <td>
<span class="user_name">{{full_name}}</span> <span class="user_name">{{full_name}}</span>
</td> </td>
@@ -34,16 +34,13 @@
{{/if}} {{/if}}
{{/if}} {{/if}}
</span> </span>
{{#if is_active}} <button class="button btn-primary open-user-form{{#unless is_active}} display-none{{/unless}}" title="{{t 'Edit user' }}" data-user-id="{{user_id}}">
<button class="button btn-primary open-user-form" title="{{t 'Edit user' }}" data-user-id="{{user_id}}"> <i class="icon-vector-pencil"></i>
<i class="icon-vector-pencil"></i> </button>
</button>
{{/if}}
<div class='admin-user-status'> <div class='admin-user-status'>
</div> </div>
</td> </td>
</tr> </tr>
{{#if is_active}}
<tr class="user-name-form display-none" data-user-id="{{user_id}}"> <tr class="user-name-form display-none" data-user-id="{{user_id}}">
<td colspan="{{#if is_bot}}4{{else}}3{{/if}}"> <td colspan="{{#if is_bot}}4{{else}}3{{/if}}">
<form class="form-horizontal name-setting"> <form class="form-horizontal name-setting">
@@ -64,5 +61,4 @@
</form> </form>
</td> </td>
</tr> </tr>
{{/if}}
{{/with}} {{/with}}