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

group_settings: Fix messages shown when adding users to a group.

Browse Source 
This commit fixes the messages shown when adding users to a group
to use "add" instead of "subscribe".

Fixes part of #24443.
This commit is contained in:
Sahil Batra
2023-09-19 13:10:15 +05:30
committed by Tim Abbott
parent a3124ddcb3
commit 8dba149364
2 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
web/src/user_group_edit_members.js
View File

@@ -2,7 +2,7 @@ import $ from "jquery";
import render_leave_user_group_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs"; import render_leave_user_group_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs";
import render_user_group_member_list_entry from "../templates/stream_settings/stream_member_list_entry.hbs"; import render_user_group_member_list_entry from "../templates/stream_settings/stream_member_list_entry.hbs";
import render_user_group_subscription_request_result from "../templates/stream_settings/stream_subscription_request_result.hbs"; import render_user_group_membership_request_result from "../templates/user_group_settings/user_group_membership_request_result.hbs";
import * as add_subscribers_pill from "./add_subscribers_pill"; import * as add_subscribers_pill from "./add_subscribers_pill";
import * as blueslip from "./blueslip"; import * as blueslip from "./blueslip";
@@ -112,17 +112,15 @@ function show_user_group_membership_request_result({
message, message,
add_class, add_class,
remove_class, remove_class,
subscribed_users, already_added_users,
already_subscribed_users,
ignored_deactivated_users, ignored_deactivated_users,
}) { }) {
const $user_group_subscription_req_result_elem = $( const $user_group_subscription_req_result_elem = $(
".user_group_subscription_request_result", ".user_group_subscription_request_result",
).expectOne(); ).expectOne();
const html = render_user_group_subscription_request_result({ const html = render_user_group_membership_request_result({
message, message,
subscribed_users, already_added_users,
already_subscribed_users,
ignored_deactivated_users, ignored_deactivated_users,
}); });
scroll_util.get_content_element($user_group_subscription_req_result_elem).html(html); scroll_util.get_content_element($user_group_subscription_req_result_elem).html(html);
@@ -161,9 +159,9 @@ function add_new_members({pill_user_ids}) {
return false; return false;
} }
if (user_groups.is_user_in_group(group.id, user_id)) { if (user_groups.is_user_in_group(group.id, user_id)) {
// we filter out already subscribed users before sending // we filter out already added users before sending
// add member request as the endpoint is not so robust and // add member request as the endpoint is not so robust and
// fails complete request if any already subscribed member // fails complete request if any already added member
// is present in the request. // is present in the request.
already_added_users.add(user_id); already_added_users.add(user_id);
return false; return false;
@@ -200,10 +198,10 @@ function add_new_members({pill_user_ids}) {
if (user_id_set.size === 0) { if (user_id_set.size === 0) {
show_user_group_membership_request_result({ show_user_group_membership_request_result({
message: $t({defaultMessage: "No user to subscribe."}), message: $t({defaultMessage: "No users to add."}),
add_class: "text-error", add_class: "text-error",
remove_class: "text-success", remove_class: "text-success",
already_subscribed_users: ignored_already_added_users, already_added_users: ignored_already_added_users,
ignored_deactivated_users, ignored_deactivated_users,
}); });
return; return;
@@ -216,13 +214,13 @@ function add_new_members({pill_user_ids}) {
message: $t({defaultMessage: "Added successfully."}), message: $t({defaultMessage: "Added successfully."}),
add_class: "text-success", add_class: "text-success",
remove_class: "text-error", remove_class: "text-error",
already_subscribed_users: ignored_already_added_users, already_added_users: ignored_already_added_users,
ignored_deactivated_users, ignored_deactivated_users,
}); });
} }
function invite_failure(xhr) { function invite_failure(xhr) {
let message = "Failed to subscribe user!"; let message = "Failed to add user!";
if (xhr.responseJSON?.msg) { if (xhr.responseJSON?.msg) {
message = xhr.responseJSON.msg; message = xhr.responseJSON.msg;
} }

21
web/templates/user_group_settings/user_group_membership_request_result.hbs Normal file
View File

@@ -0,0 +1,21 @@
{{#if message}}
{{message}}
<br />
{{/if}}
{{#if already_added_users}}
{{#each already_added_users}}
{{#if @first}}
{{t "Already members:" }}
{{/if}}
<a data-user-id="{{user_id}}" class="view_user_profile">{{full_name}}</a>{{#unless @last}},{{else}}.{{/unless}}
{{/each}}
<br />
{{/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}}