paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

realms: Create default system user groups for internal realm.

Browse Source 
Since we include internal realms while creating system groups
in "0382_create_role_based_system_groups.py", we should do it
when creating new internal realms as well to be consistent.

Tests are changed accordingly as UserGroup objects are created.
We also change the user group ids used in api docs examples
such that user groups are of correct realm.
This commit is contained in:
Sahil Batra
2022-06-28 22:34:17 +05:30
committed by Tim Abbott
parent 9b8d9d038a
commit 393afc9781
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/lib/server_initialization.py
View File

@@ -3,6 +3,7 @@ from typing import Iterable, Optional, Tuple
from django.conf import settings from django.conf import settings
from zerver.lib.bulk_create import bulk_create_users from zerver.lib.bulk_create import bulk_create_users
from zerver.lib.user_groups import create_system_user_groups_for_realm
from zerver.models import ( from zerver.models import (
Realm, Realm,
RealmAuditLog, RealmAuditLog,
@@ -25,6 +26,7 @@ def create_internal_realm() -> None:
realm=realm, event_type=RealmAuditLog.REALM_CREATED, event_time=realm.date_created realm=realm, event_type=RealmAuditLog.REALM_CREATED, event_time=realm.date_created
) )
RealmUserDefault.objects.create(realm=realm) RealmUserDefault.objects.create(realm=realm)
create_system_user_groups_for_realm(realm)
# Create some client objects for common requests. Not required; # Create some client objects for common requests. Not required;
# just ensures these get low IDs in production, and in development # just ensures these get low IDs in production, and in development

4
zerver/openapi/zulip.yaml
View File

@@ -14303,7 +14303,7 @@ paths:
type: array type: array
items: items:
type: integer type: integer
example: [1, 2] example: [8, 9]
required: false required: false
responses: responses:
"200": "200":
@@ -16459,7 +16459,7 @@ components:
The ID of the target user group. The ID of the target user group.
schema: schema:
type: integer type: integer
example: 22 example: 29
required: true required: true
QueueId: QueueId:
name: queue_id name: queue_id

2
zerver/tests/test_user_groups.py
View File

@@ -39,7 +39,7 @@ class UserGroupTestCase(ZulipTestCase):
def test_user_groups_in_realm_serialized(self) -> None: def test_user_groups_in_realm_serialized(self) -> None:
realm = get_realm("zulip") realm = get_realm("zulip")
user_group = UserGroup.objects.first() user_group = UserGroup.objects.filter(realm=realm).first()
assert user_group is not None assert user_group is not None
membership = UserGroupMembership.objects.filter(user_group=user_group).values_list( membership = UserGroupMembership.objects.filter(user_group=user_group).values_list(
"user_profile_id", flat=True "user_profile_id", flat=True