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

stream: Rename function to get defaults for stream permission groups.

Browse Source
This commit is contained in:
Shubham Padia
2024-12-02 06:41:20 +00:00
committed by Tim Abbott
parent a35addda73
commit 6dcd4c4ca6
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
analytics/management/commands/populate_analytics_db.py
View File

@@ -23,7 +23,7 @@ from zerver.lib.create_user import create_user
from zerver.lib.management import ZulipBaseCommand
from zerver.lib.storage import static_path
from zerver.lib.stream_color import STREAM_ASSIGNMENT_COLORS
from zerver.lib.streams import get_default_group_setting_values
from zerver.lib.streams import get_default_values_for_stream_permission_group_settings
from zerver.lib.timestamp import floor_to_day
from zerver.lib.upload import upload_message_attachment_from_request
from zerver.models import Client, Realm, RealmAuditLog, Recipient, Stream, Subscription, UserProfile
@@ -110,7 +110,7 @@ class Command(ZulipBaseCommand):
name="all",
realm=realm,
date_created=installation_time,
**get_default_group_setting_values(realm),
**get_default_values_for_stream_permission_group_settings(realm),
)
recipient = Recipient.objects.create(type_id=stream.id, type=Recipient.STREAM)
stream.recipient = recipient

4
analytics/tests/test_counts.py
View File

@@ -55,7 +55,7 @@ from zerver.lib.push_notifications import (
get_message_payload_gcm,
hex_to_b64,
)
from zerver.lib.streams import get_default_group_setting_values
from zerver.lib.streams import get_default_values_for_stream_permission_group_settings
from zerver.lib.test_classes import ZulipTestCase
from zerver.lib.test_helpers import activate_push_notification_service
from zerver.lib.timestamp import TimeZoneNotUTCError, ceiling_to_day, floor_to_day
@@ -165,7 +165,7 @@ class AnalyticsTestCase(ZulipTestCase):
"name": f"stream name {self.name_counter}",
"realm": self.default_realm,
"date_created": self.TIME_LAST_HOUR,
**get_default_group_setting_values(self.default_realm),
**get_default_values_for_stream_permission_group_settings(self.default_realm),
}
for key, value in defaults.items():
kwargs[key] = kwargs.get(key, value)