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

models: Remove "role" field from Subscription.

Browse Source 
This commit removes "role" field from subscription
objects since we are not moving forward with stream
administrator concept and instead working on new
permssions model as per #19525.
This commit is contained in:
Sahil Batra
2022-07-05 20:12:29 +05:30
committed by Tim Abbott
parent 83383090f9
commit 093a74bd54
11 changed files with 35 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/tests/test_subs.py
View File

@@ -29,7 +29,6 @@ from zerver.actions.streams import (
bulk_add_subscriptions,
bulk_remove_subscriptions,
do_change_stream_post_policy,
do_change_subscription_property,
do_deactivate_stream,
)
from zerver.actions.users import do_change_user_role, do_deactivate_user
@@ -1601,13 +1600,8 @@ class StreamAdminTest(ZulipTestCase):
user_profile = self.example_user("hamlet")
self.login_user(user_profile)
stream = self.subscribe(user_profile, "stream_name1")
sub = get_subscription("stream_name1", user_profile)
self.subscribe(user_profile, "stream_name1")
do_change_user_role(user_profile, UserProfile.ROLE_MEMBER, acting_user=None)
do_change_subscription_property(
user_profile, sub, stream, "role", Subscription.ROLE_MEMBER, acting_user=None
)
stream_id = get_stream("stream_name1", user_profile.realm).id
result = self.client_patch(
@@ -1658,12 +1652,8 @@ class StreamAdminTest(ZulipTestCase):
self.login_user(user_profile)
stream = self.subscribe(user_profile, "stream_name1")
sub = get_subscription("stream_name1", user_profile)
do_change_user_role(user_profile, UserProfile.ROLE_MEMBER, acting_user=None)
do_change_subscription_property(
user_profile, sub, stream, "role", Subscription.ROLE_MEMBER, acting_user=None
)
do_set_realm_property(user_profile.realm, "waiting_period_threshold", 10, acting_user=None)