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

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

Browse Source 
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
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) { if (page_params.is_admin) {
$("#deactivate_realm_button").prop("disabled", true); $("#deactivate_realm_button").prop("disabled", true);
$("#org-message-retention").find("input, select").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; return;
} }

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

@@ -4,6 +4,7 @@
<div id="org-join" class="org-subsection-parent"> <div id="org-join" class="org-subsection-parent">
<div class="subsection-header"> <div class="subsection-header">
<h3>{{t "Joining the organization" }}</h3> <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" }} {{> settings_save_discard_widget section_name="org-join" }}
</div> </div>
<div class="m-10 inline-block organization-permissions-parent"> <div class="m-10 inline-block organization-permissions-parent">
@@ -14,7 +15,6 @@
is_checked=realm_invite_required is_checked=realm_invite_required
label=admin_settings_label.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" }} <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> </label>
<select name="realm_invite_to_realm_policy" id="id_realm_invite_to_realm_policy" class="prop-element" data-setting-widget-type="number"> <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}} {{> dropdown_options_widget option_values=invite_to_realm_policy_values}}
@@ -30,7 +30,7 @@
</select> </select>
<div class="dependent-block"> <div class="dependent-block">
<p id="allowed_domains_label" class="inline-block"></p> <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> <a id="show_realm_domains_modal" role="button">{{t "[Configure]" }}</a>
{{/if}} {{/if}}
</div> </div>