invites: Do not show streams if user cannot subscribe others.

We do not show the streams list in invite modal if the user
does not have permission to subscribe others to stream and
show a notice mentioning it.
This commit is contained in:
Sahil Batra
2023-04-23 21:25:22 +05:30
committed by Tim Abbott
parent a6be1d1018
commit 016917679e
4 changed files with 15 additions and 4 deletions

View File

@@ -340,6 +340,7 @@ function open_invite_user_modal(e: JQuery.ClickEvent<Document, undefined>): void
new_stream_announcements_stream: stream_data.get_new_stream_announcements_stream(), new_stream_announcements_stream: stream_data.get_new_stream_announcements_stream(),
show_select_default_streams_option: stream_data.get_default_stream_ids().length !== 0, show_select_default_streams_option: stream_data.get_default_stream_ids().length !== 0,
user_has_email_set: !settings_data.user_email_not_configured(), user_has_email_set: !settings_data.user_email_not_configured(),
can_subscribe_other_users: settings_data.user_can_subscribe_other_users(),
}); });
function invite_user_modal_post_render(): void { function invite_user_modal_post_render(): void {

View File

@@ -529,7 +529,8 @@ div.overlay {
.upgrade-tip, .upgrade-tip,
.upgrade-or-sponsorship-tip, .upgrade-or-sponsorship-tip,
.tip { .tip,
.invite-stream-notice {
position: relative; position: relative;
display: block; display: block;
background-color: hsl(46deg 63% 95%); background-color: hsl(46deg 63% 95%);

View File

@@ -825,7 +825,8 @@
.upgrade-tip, .upgrade-tip,
.upgrade-or-sponsorship-tip, .upgrade-or-sponsorship-tip,
.tip { .tip,
.invite-stream-notice {
color: inherit; color: inherit;
background-color: hsl(46deg 28% 38% / 27%); background-color: hsl(46deg 28% 38% / 27%);
border: 1px solid hsl(49deg 38% 46%); border: 1px solid hsl(49deg 38% 46%);

View File

@@ -3,14 +3,20 @@
{{#if development_environment}} {{#if development_environment}}
<div class="alert" id="dev_env_msg"></div> <div class="alert" id="dev_env_msg"></div>
{{/if}} {{/if}}
{{#unless user_has_email_set }} {{#if (not user_has_email_set) }}
<div class="tip"> <div class="tip">
{{#tr}} {{#tr}}
You must <z-link>configure your email</z-link> to access this feature. You must <z-link>configure your email</z-link> to access this feature.
{{#*inline "z-link"}}<a href="/help/demo-organizations#configure-email-for-demo-organization-owner" target="_blank" rel="noopener noreferrer">{{> @partial-block }}</a>{{/inline}} {{#*inline "z-link"}}<a href="/help/demo-organizations#configure-email-for-demo-organization-owner" target="_blank" rel="noopener noreferrer">{{> @partial-block }}</a>{{/inline}}
{{/tr}} {{/tr}}
</div> </div>
{{/unless}} {{else if (not can_subscribe_other_users)}}
<div class="invite-stream-notice">
{{#tr}}The users you invite will be automatically added to <z-link>default streams</z-link> for this organization, as you do not have permission to configure which streams new users join.
{{#*inline "z-link"}}<a target="_blank" rel="noopener noreferrer" href="#organization/default-streams-list">{{> @partial-block}}</a>{{/inline}}
{{/tr}}
</div>
{{/if}}
<div class="input-group"> <div class="input-group">
<div id="invite_users_option_tabs_container" class="new-style"></div> <div id="invite_users_option_tabs_container" class="new-style"></div>
<div id="invitee_emails_container"> <div id="invitee_emails_container">
@@ -55,6 +61,7 @@
{{/if}} {{/if}}
</select> </select>
</div> </div>
{{#if can_subscribe_other_users}}
<div> <div>
<label>{{t "Channels they should join" }}</label> <label>{{t "Channels they should join" }}</label>
<div id="streams_to_add"> <div id="streams_to_add">
@@ -90,4 +97,5 @@
</div> </div>
</div> </div>
</div> </div>
{{/if}}
</form> </form>