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

settings: Disable "Joining the organization" settings for admins. 

This commit disables the settings in "Joining the organization"
subsection for admins as they can be changed by only owners.

We also move the tooltip mentioning "Only owners can change..."
to the subsection heading.
This commit is contained in:
Sahil Batra 2021-07-29 17:23:27 +05:30 committed by Tim Abbott
parent 6ddc83d034
commit 05b7ca01c4
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
static/js/settings_org.js
View File

@ -46,7 +46,8 @@ export function maybe_disable_widgets() {
if (page_params.is_admin) {
$("#deactivate_realm_button").prop("disabled", true);
$("#org-message-retention").find("input, select").prop("disabled", true);
$("#id_realm_invite_to_realm_policy").prop("disabled", true);
$("#org-join").find("input, select").prop("disabled", true);
$("#id_realm_invite_required_label").parent().addClass("control-label-disabled");
return;
}

4
static/templates/settings/organization_permissions_admin.hbs
View File

@ -4,6 +4,7 @@
<div id="org-join" class="org-subsection-parent">
<div class="subsection-header">
<h3>{{t "Joining the organization" }}</h3>
<i class="fa fa-info-circle settings-info-icon realm_message_retention_tooltip tippy-zulip-tooltip" aria-hidden="true" data-tippy-content="{{t 'Only owners can change these settings.' }}"></i>
{{> settings_save_discard_widget section_name="org-join" }}
</div>
<div class="m-10 inline-block organization-permissions-parent">
@ -14,7 +15,6 @@
is_checked=realm_invite_required
label=admin_settings_label.realm_invite_required}}
<label for="realm_invite_to_realm_policy" class="dropdown-title">{{t "Who can invite users to this organization" }}
<i class="fa fa-info-circle settings-info-icon realm_message_retention_tooltip tippy-zulip-tooltip" aria-hidden="true" data-tippy-content="{{t 'Only owners can change this setting.' }}"></i>
</label>
<select name="realm_invite_to_realm_policy" id="id_realm_invite_to_realm_policy" class="prop-element" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=invite_to_realm_policy_values}}
@ -30,7 +30,7 @@
</select>
<div class="dependent-block">
<p id="allowed_domains_label" class="inline-block"></p>
{{#if is_admin }}
{{#if is_owner }}
<a id="show_realm_domains_modal" role="button">{{t "[Configure]" }}</a>
{{/if}}
</div>