From 2d39b14a387b52ceab00114cecf82090fa83d2fe Mon Sep 17 00:00:00 2001 From: Sahil Batra Date: Sun, 10 Oct 2021 15:16:39 +0530 Subject: [PATCH] user_groups: Rename members field of UserGroup to direct_members. 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 --- zerver/lib/import_realm.py | 2 +- zerver/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zerver/lib/import_realm.py b/zerver/lib/import_realm.py index 2e6e6edeef..d2c4934581 100644 --- a/zerver/lib/import_realm.py +++ b/zerver/lib/import_realm.py @@ -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) diff --git a/zerver/models.py b/zerver/models.py index 014a7b3008..ec7dc7473a 100644 --- a/zerver/models.py +++ b/zerver/models.py @@ -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)