paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 20:13:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Rename permissions_configuration variable.

Browse Source 
This commit renames permissions_configuration variable to
permission_configuration since the object contains config for
a single permission setting and thus permission_configuration
seems like a better name.
This commit is contained in:
Sahil Batra
2023-10-31 16:58:49 +05:30
committed by Tim Abbott
parent 1112cbc822
commit 08d41f9eb3
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/actions/create_realm.py
View File

@@ -122,8 +122,8 @@ def set_realm_permissions_based_on_org_type(realm: Realm) -> None:
def set_default_for_realm_permission_group_settings(realm: Realm) -> None:
system_groups_dict = get_role_based_system_groups_dict(realm)
for setting_name, permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
group_name = permissions_configuration.default_group_name
for setting_name, permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
group_name = permission_configuration.default_group_name
setattr(realm, setting_name, system_groups_dict[group_name])
realm.save(update_fields=list(Realm.REALM_PERMISSION_GROUP_SETTINGS.keys()))
@@ -224,8 +224,8 @@ def do_create_realm(
# For now a dummy value of -1 is given to groups fields which
# is changed later before the transaction is committed.
for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
setattr(realm, permissions_configuration.id_field_name, -1)
for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
setattr(realm, permission_configuration.id_field_name, -1)
realm.save()

4
zerver/lib/events.py
View File

@@ -254,9 +254,9 @@ def fetch_initial_state_data(
for (
setting_name,
permissions_configuration,
permission_configuration,
) in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
state["realm_" + setting_name] = getattr(realm, permissions_configuration.id_field_name)
state["realm_" + setting_name] = getattr(realm, permission_configuration.id_field_name)
# Most state is handled via the property_types framework;
# these manual entries are for those realm settings that don't

4
zerver/lib/import_realm.py
View File

@@ -977,8 +977,8 @@ def do_import_realm(import_dir: Path, subdomain: str, processes: int = 1) -> Rea
if "zerver_usergroup" not in data:
# For now a dummy value of -1 is given to groups fields which
# is changed later before the transaction is committed.
for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
setattr(realm, permissions_configuration.id_field_name, -1)
for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
setattr(realm, permission_configuration.id_field_name, -1)
realm.save()

4
zerver/lib/server_initialization.py
View File

@@ -30,8 +30,8 @@ def create_internal_realm() -> None:
# For now a dummy value of -1 is given to groups fields which
# is changed later before the transaction is committed.
for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
setattr(realm, permissions_configuration.id_field_name, -1)
for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
setattr(realm, permission_configuration.id_field_name, -1)
realm.save()
RealmAuditLog.objects.create(

4
zerver/tests/test_realm.py
View File

@@ -925,10 +925,10 @@ class RealmTest(ZulipTestCase):
for (
setting_name,
permissions_configuration,
permission_configuration,
) in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
self.assertEqual(
getattr(realm, setting_name).name, permissions_configuration.default_group_name
getattr(realm, setting_name).name, permission_configuration.default_group_name
)
def test_do_create_realm_with_keyword_arguments(self) -> None:

18
zerver/views/realm.py
View File

@@ -330,8 +330,8 @@ def update_realm(
if k in realm.property_types:
req_vars[k] = v
for permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
if k == permissions_configuration.id_field_name:
for permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.values():
if k == permission_configuration.id_field_name:
req_group_setting_vars[k] = v
for k, v in req_vars.items():
@@ -342,8 +342,8 @@ def update_realm(
else:
data[k] = v
for setting_name, permissions_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
setting_group_id_name = permissions_configuration.id_field_name
for setting_name, permission_configuration in Realm.REALM_PERMISSION_GROUP_SETTINGS.items():
setting_group_id_name = permission_configuration.id_field_name
assert setting_group_id_name in req_group_setting_vars
@@ -355,11 +355,11 @@ def update_realm(
user_group_id,
user_profile,
setting_name=setting_name,
require_system_group=permissions_configuration.require_system_group,
allow_internet_group=permissions_configuration.allow_internet_group,
allow_owners_group=permissions_configuration.allow_owners_group,
allow_nobody_group=permissions_configuration.allow_nobody_group,
allow_everyone_group=permissions_configuration.allow_everyone_group,
require_system_group=permission_configuration.require_system_group,
allow_internet_group=permission_configuration.allow_internet_group,
allow_owners_group=permission_configuration.allow_owners_group,
allow_nobody_group=permission_configuration.allow_nobody_group,
allow_everyone_group=permission_configuration.allow_everyone_group,
)
do_change_realm_permission_group_setting(
realm, setting_name, user_group, acting_user=user_profile

14
zerver/views/streams.py
View File

@@ -375,9 +375,9 @@ def update_stream_backend(
if stream_post_policy is not None:
do_change_stream_post_policy(stream, stream_post_policy, acting_user=user_profile)
for setting_name, permissions_configuration in Stream.stream_permission_group_settings.items():
for setting_name, permission_configuration in Stream.stream_permission_group_settings.items():
request_settings_dict = locals()
setting_group_id_name = permissions_configuration.id_field_name
setting_group_id_name = permission_configuration.id_field_name
if setting_group_id_name not in request_settings_dict: # nocoverage
continue
@@ -394,11 +394,11 @@ def update_stream_backend(
user_group_id,
user_profile,
setting_name=setting_name,
require_system_group=permissions_configuration.require_system_group,
allow_internet_group=permissions_configuration.allow_internet_group,
allow_owners_group=permissions_configuration.allow_owners_group,
allow_nobody_group=permissions_configuration.allow_nobody_group,
allow_everyone_group=permissions_configuration.allow_everyone_group,
require_system_group=permission_configuration.require_system_group,
allow_internet_group=permission_configuration.allow_internet_group,
allow_owners_group=permission_configuration.allow_owners_group,
allow_nobody_group=permission_configuration.allow_nobody_group,
allow_everyone_group=permission_configuration.allow_everyone_group,
)
do_change_stream_group_based_setting(
stream, setting_name, user_group, acting_user=user_profile