CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-03 21:10:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

user_groups: Rename members field of UserGroup to direct_members.

Browse Source 
This commit renames members field of UserGroup to direct_members
for better readability because in the new permissions model, a
user group can be a sub-group of another group and thus technically
members of sub-group will also be members of that group.
This is a prep commit for new permissions model.

Extracted this commit from #19866.

Co-authored-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Sahil Batra 2021-10-10 15:16:39 +05:30 committed by Tim Abbott
parent e47662aa19
commit 2d39b14a38
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/import_realm.py
View File

@ -1119,7 +1119,7 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
if "zerver_usergroup" in data:
re_map_foreign_keys(data, "zerver_usergroup", "realm", related_table="realm")
re_map_foreign_keys_many_to_many(
data, "zerver_usergroup", "members", related_table="user_profile"
data, "zerver_usergroup", "direct_members", related_table="user_profile"
)
update_model_ids(UserGroup, data, "usergroup")
bulk_import_model(data, UserGroup)

2
zerver/models.py
View File

@ -1978,7 +1978,7 @@ class PasswordTooWeakError(Exception):
class UserGroup(models.Model):
id: int = models.AutoField(auto_created=True, primary_key=True, verbose_name="ID")
name: str = models.CharField(max_length=100)
members: Manager = models.ManyToManyField(UserProfile, through="UserGroupMembership")
direct_members: Manager = models.ManyToManyField(UserProfile, through="UserGroupMembership")
realm: Realm = models.ForeignKey(Realm, on_delete=CASCADE)
description: str = models.TextField(default="")
is_system_group: bool = models.BooleanField(default=False)