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

settings: Rename setting_group_id and setting_group variables.

Browse Source 
Since the variable value can also be an object if setting is
set to an anonymous group, it is better to rename the variable
in user_has_permission_for_group_setting from setting_group_id
to setting_value.

Similary in is_user_in_setting_group, setting_group variable is
renamed to setting_value since value passed is not a UserGroup
object.
This commit is contained in:
Sahil Batra
2024-12-12 17:15:21 +05:30
committed by Tim Abbott
parent 213c9e6a7a
commit cf59071d42
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/settings_data.ts
View File

@@ -91,7 +91,7 @@ function user_has_permission(policy_value: number): boolean {
}
export function user_has_permission_for_group_setting(
setting_group_id: GroupSettingValue,
setting_value: GroupSettingValue,
setting_name: string,
setting_type: "realm" | "stream" | "group",
): boolean {
@@ -109,7 +109,7 @@ export function user_has_permission_for_group_setting(
return false;
}
return user_groups.is_user_in_setting_group(setting_group_id, current_user.user_id);
return user_groups.is_user_in_setting_group(setting_value, current_user.user_id);
}
export function user_can_invite_users_by_email(): boolean {

10
web/src/user_groups.ts
View File

@@ -474,19 +474,19 @@ export function format_group_list(user_groups: UserGroup[]): string {
}
export function is_user_in_setting_group(
setting_group: GroupSettingValue,
setting_value: GroupSettingValue,
user_id: number,
): boolean {
if (typeof setting_group === "number") {
return is_user_in_group(setting_group, user_id);
if (typeof setting_value === "number") {
return is_user_in_group(setting_value, user_id);
}
const direct_members = setting_group.direct_members;
const direct_members = setting_value.direct_members;
if (direct_members.includes(user_id)) {
return true;
}
const direct_subgroups = setting_group.direct_subgroups;
const direct_subgroups = setting_value.direct_subgroups;
for (const direct_subgroup_id of direct_subgroups) {
if (is_user_in_group(direct_subgroup_id, user_id)) {
return true;