paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Include ignored deactivated users in result banner.

Browse Source 
This introduces the ignored deactivated user messages
in the channel and user group subscription banners.
Related:
https://chat.zulip.org/#narrow/channel/101-design/topic/New.20channel.2Fgroup.20UX.20changes/near/2215785

Fixes #34347.
Signed-off-by: apoorvapendse <apoorvavpendse@gmail.com>
This commit is contained in:
apoorvapendse
2025-07-09 11:13:57 +05:30
committed by Tim Abbott
parent 3c26086c4b
commit 0908f0ac30
4 changed files with 75 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
web/templates/stream_settings/stream_subscription_request_result.hbs
View File

@@ -10,7 +10,9 @@
<div class="banner-wrapper">
<div class="banner banner-success">
<span class="banner-label">
{{#if (eq subscribed_users_count 0)}}
{{!-- We want to show ignored deactivated users message even when there are
no new subscribers --}}
{{#if (and (eq subscribed_users_count 0) (eq ignored_deactivated_users_count 0))}}
{{t "All users were already subscribed."}}
{{else}}
{{#if (not is_total_subscriber_more_than_five) }}
@@ -20,6 +22,9 @@
{{#if already_subscribed_users}}
{{t "Already a subscriber:" }} {{{subscribe_success_messages.already_subscribed_users_message}}}.
{{/if}}
{{#if ignored_deactivated_users}}
{{t "Ignored deactivated users:" }} {{{subscribe_success_messages.ignored_deactivated_users_message}}}.
{{/if}}
{{else}}
{{#if subscribed_users}}
{{t "{subscribed_users_count, plural,
@@ -31,6 +36,12 @@
{{t "{already_subscribed_users_count, plural,
one {Already subscribed: {already_subscribed_users_count} user.}
other {Already subscribed: {already_subscribed_users_count} users.}
}"}}
{{/if}}
{{#if ignored_deactivated_users}}
{{t "{ignored_deactivated_users_count, plural,
one {Ignored deactivated: {ignored_deactivated_users_count} user.}
other {Ignored deactivated: {ignored_deactivated_users_count} users.}
}"}}
{{/if}}
{{/if}}
@@ -39,11 +50,3 @@
</div>
</div>
{{/if}}
{{#if ignored_deactivated_users}}
{{#each ignored_deactivated_users}}
{{#if @first}}
{{t "Ignored deactivated users:" }}
{{/if}}
<a data-user-id="{{user_id}}" class="view_user_profile">{{full_name}}</a>{{#unless @last}},{{else}}.{{/unless}}
{{/each}}
{{/if}}