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

settings: Allow admin to change email/name even if it is disabled in realm.

Browse Source 
Allow realm admin users to change their email or name even,
changing name or email is disabled in realm.
This commit is contained in:
YJDave
2018-02-02 21:24:26 +05:30
committed by Tim Abbott
parent f0d651f9fe
commit ce46cd914a
7 changed files with 42 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
static/js/settings_account.js
View File

@@ -104,7 +104,7 @@ exports.set_up = function () {
$("#change_full_name").on('click', function (e) {
e.preventDefault();
e.stopPropagation();
if (!page_params.realm_name_changes_disabled) {
if (!page_params.realm_name_changes_disabled || page_params.is_admin) {
overlays.open_modal('change_full_name_modal');
}
});
@@ -245,7 +245,7 @@ exports.set_up = function () {
$('#change_email').on('click', function (e) {
e.preventDefault();
e.stopPropagation();
if (!page_params.realm_email_changes_disabled) {
if (!page_params.realm_email_changes_disabled || page_params.is_admin) {
overlays.open_modal('change_email_modal');
var email = $('#email_value').text().trim();
$('.email_change_container').find("input[name='email']").val(email);

6
static/js/settings_org.js
View File

@@ -72,7 +72,9 @@ exports.reset_realm_default_language = function () {
exports.toggle_name_change_display = function () {
if (!meta.loaded) {
// If user is an org admin, return. Cause org admin can change
// name or email even name changes or email changes are disabled in org.
if (!meta.loaded || page_params.is_admin) {
return;
}
@@ -85,7 +87,7 @@ exports.toggle_name_change_display = function () {
};
exports.toggle_email_change_display = function () {
if (!meta.loaded) {
if (!meta.loaded || page_params.is_admin) {
return;
}