paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

django-2.0: Don't assign directly to Many-to-Many field.

Browse Source 
The old pattern of setting the value and then using .save() here has
been deprecated.  set() also saves the record.
This commit is contained in:
rht
2018-01-31 12:22:07 +05:00
committed by Tim Abbott
parent e4a62aa778
commit 71ff8c370e
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -3053,8 +3053,7 @@ def do_create_default_stream_group(realm: Realm, group_name: Text,
raise JsonableError(_("Default stream group '%(group_name)s' already exists") raise JsonableError(_("Default stream group '%(group_name)s' already exists")
% {'group_name': group_name}) % {'group_name': group_name})
group.streams = streams group.streams.set(streams)
group.save()
notify_default_stream_groups(realm) notify_default_stream_groups(realm)
def do_add_streams_to_default_stream_group(realm: Realm, group: DefaultStreamGroup, def do_add_streams_to_default_stream_group(realm: Realm, group: DefaultStreamGroup,
@@ -4092,8 +4091,7 @@ def do_create_multiuse_invite_link(referred_by: UserProfile, streams: Optional[L
realm = referred_by.realm realm = referred_by.realm
invite = MultiuseInvite.objects.create(realm=realm, referred_by=referred_by) invite = MultiuseInvite.objects.create(realm=realm, referred_by=referred_by)
if streams: if streams:
invite.streams = streams invite.streams.set(streams)
invite.save()
return create_confirmation_link(invite, realm.host, Confirmation.MULTIUSE_INVITE) return create_confirmation_link(invite, realm.host, Confirmation.MULTIUSE_INVITE)

3
zerver/management/commands/create_default_stream_groups.py
View File

@@ -57,8 +57,7 @@ Create default stream groups which the users can choose during sign up.
except DefaultStreamGroup.DoesNotExist: except DefaultStreamGroup.DoesNotExist:
default_stream_group = DefaultStreamGroup.objects.create( default_stream_group = DefaultStreamGroup.objects.create(
name=options["name"], realm=realm, description=options["description"]) name=options["name"], realm=realm, description=options["description"])
default_stream_group.streams = streams default_stream_group.streams.set(streams)
default_stream_group.save()
default_stream_groups = DefaultStreamGroup.objects.all() default_stream_groups = DefaultStreamGroup.objects.all()
for default_stream_group in default_stream_groups: for default_stream_group in default_stream_groups:

3
zerver/tests/test_auth_backends.py
View File

@@ -892,8 +892,7 @@ class GoogleSubdomainLoginTest(GoogleOAuthTest):
# Now confirm an invitation link works # Now confirm an invitation link works
referrer = self.example_user("hamlet") referrer = self.example_user("hamlet")
multiuse_obj = MultiuseInvite.objects.create(realm=realm, referred_by=referrer) multiuse_obj = MultiuseInvite.objects.create(realm=realm, referred_by=referrer)
multiuse_obj.streams = streams multiuse_obj.streams.set(streams)
multiuse_obj.save()
invite_link = create_confirmation_link(multiuse_obj, realm.host, invite_link = create_confirmation_link(multiuse_obj, realm.host,
Confirmation.MULTIUSE_INVITE) Confirmation.MULTIUSE_INVITE)

3
zerver/tests/test_signup.py
View File

@@ -1024,8 +1024,7 @@ class MultiuseInviteTest(ZulipTestCase):
invite.save() invite.save()
if streams is not None: if streams is not None:
invite.streams = streams invite.streams.set(streams)
invite.save()
if date_sent is None: if date_sent is None:
date_sent = timezone_now() date_sent = timezone_now()

3
zerver/views/auth.py
View File

@@ -92,8 +92,7 @@ def maybe_send_to_registration(request: HttpRequest, email: Text, full_name: Tex
del request.session["multiuse_object_key"] del request.session["multiuse_object_key"]
request.session.modified = True request.session.modified = True
if streams_to_subscribe is not None: if streams_to_subscribe is not None:
prereg_user.streams = streams_to_subscribe prereg_user.streams.set(streams_to_subscribe)
prereg_user.save()
return redirect("".join(( return redirect("".join((
create_confirmation_link(prereg_user, request.get_host(), Confirmation.USER_REGISTRATION), create_confirmation_link(prereg_user, request.get_host(), Confirmation.USER_REGISTRATION),

3
zerver/views/registration.py
View File

@@ -304,8 +304,7 @@ def prepare_activation_url(email: str, request: HttpRequest,
prereg_user = create_preregistration_user(email, request, realm_creation) prereg_user = create_preregistration_user(email, request, realm_creation)
if streams is not None: if streams is not None:
prereg_user.streams = streams prereg_user.streams.set(streams)
prereg_user.save()
confirmation_type = Confirmation.USER_REGISTRATION confirmation_type = Confirmation.USER_REGISTRATION
if realm_creation: if realm_creation: