mirror of
https://github.com/zulip/zulip.git
synced 2025-11-10 17:07:07 +00:00
Use update_fields more consistently when modifying model objects.
(imported from commit a3f0c308b621b5ff85c55654f187e25749192b19)
This commit is contained in:
@@ -936,7 +936,7 @@ def subscribed_to_stream(user_profile, stream):
|
|||||||
|
|
||||||
def do_update_onboarding_steps(user_profile, steps):
|
def do_update_onboarding_steps(user_profile, steps):
|
||||||
user_profile.onboarding_steps = ujson.dumps(steps)
|
user_profile.onboarding_steps = ujson.dumps(steps)
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["onboarding_steps"])
|
||||||
|
|
||||||
log_event({'type': 'update_onboarding',
|
log_event({'type': 'update_onboarding',
|
||||||
'user': user_profile.email,
|
'user': user_profile.email,
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ Usage: python manage.py bankrupt_users <list of email addresses>"""
|
|||||||
old_pointer = user_profile.pointer
|
old_pointer = user_profile.pointer
|
||||||
new_pointer = messages[0].id
|
new_pointer = messages[0].id
|
||||||
user_profile.pointer = new_pointer
|
user_profile.pointer = new_pointer
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["pointer"])
|
||||||
print "%s: %d => %d" % (email, old_pointer, new_pointer)
|
print "%s: %d => %d" % (email, old_pointer, new_pointer)
|
||||||
else:
|
else:
|
||||||
print "%s has no messages, can't bankrupt!" % (email,)
|
print "%s has no messages, can't bankrupt!" % (email,)
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ class Command(BaseCommand):
|
|||||||
if options["for_real"]:
|
if options["for_real"]:
|
||||||
tutorial_user = subscribers[0]
|
tutorial_user = subscribers[0]
|
||||||
tutorial_user.active = False
|
tutorial_user.active = False
|
||||||
tutorial_user.save()
|
tutorial_user.save(update_fields=["active"])
|
||||||
|
|
||||||
if options["for_real"]:
|
if options["for_real"]:
|
||||||
print "Subscriptions deactivated."
|
print "Subscriptions deactivated."
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ def restore(change):
|
|||||||
continue
|
continue
|
||||||
if change:
|
if change:
|
||||||
u.pointer = pointer
|
u.pointer = pointer
|
||||||
u.save()
|
u.save(update_fields=["pointer"])
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
option_list = BaseCommand.option_list + (
|
option_list = BaseCommand.option_list + (
|
||||||
|
|||||||
@@ -558,21 +558,22 @@ def restore_saved_messages():
|
|||||||
# Just handle these the slow way
|
# Just handle these the slow way
|
||||||
user_profile = users[old_message["user"]]
|
user_profile = users[old_message["user"]]
|
||||||
user_profile.full_name = old_message["full_name"]
|
user_profile.full_name = old_message["full_name"]
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["full_name"])
|
||||||
continue
|
continue
|
||||||
elif message_type == "enable_desktop_notifications_changed":
|
elif message_type == "enable_desktop_notifications_changed":
|
||||||
# Just handle these the slow way
|
# Just handle these the slow way
|
||||||
user_profile = users[old_message["user"]]
|
user_profile = users[old_message["user"]]
|
||||||
user_profile.enable_desktop_notifications = (old_message["enable_desktop_notifications"] != "false")
|
user_profile.enable_desktop_notifications = (old_message["enable_desktop_notifications"] != "false")
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["enable_desktop_notifications"])
|
||||||
continue
|
continue
|
||||||
elif message_type == "enable_sounds_changed":
|
elif message_type == "enable_sounds_changed":
|
||||||
user_profile = users[old_message["user"]]
|
user_profile = users[old_message["user"]]
|
||||||
user_profile.enable_sounds = (old_message["enable_sounds"] != "false")
|
user_profile.enable_sounds = (old_message["enable_sounds"] != "false")
|
||||||
|
user_profile.save(update_fields=["enable_sounds"])
|
||||||
elif message_type == "enable_offline_email_notifications_changed":
|
elif message_type == "enable_offline_email_notifications_changed":
|
||||||
user_profile = users[old_message["user"]]
|
user_profile = users[old_message["user"]]
|
||||||
user_profile.enable_offline_email_notifications = (old_message["enable_offline_email_notifications"] != "false")
|
user_profile.enable_offline_email_notifications = (old_message["enable_offline_email_notifications"] != "false")
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["enable_offline_email_notifications"])
|
||||||
continue
|
continue
|
||||||
elif message_type == "default_streams":
|
elif message_type == "default_streams":
|
||||||
set_default_streams(Realm.objects.get(domain=old_message["domain"]),
|
set_default_streams(Realm.objects.get(domain=old_message["domain"]),
|
||||||
@@ -656,7 +657,7 @@ def restore_saved_messages():
|
|||||||
with transaction.commit_on_success():
|
with transaction.commit_on_success():
|
||||||
for (sub, active) in subscriptions_to_change:
|
for (sub, active) in subscriptions_to_change:
|
||||||
current_subs_obj[sub].active = active
|
current_subs_obj[sub].active = active
|
||||||
current_subs_obj[sub].save()
|
current_subs_obj[sub].save(update_fields=["active"])
|
||||||
|
|
||||||
subs = {}
|
subs = {}
|
||||||
for sub in Subscription.objects.all():
|
for sub in Subscription.objects.all():
|
||||||
@@ -683,7 +684,7 @@ def restore_saved_messages():
|
|||||||
user_profile.pointer = top.message_id
|
user_profile.pointer = top.message_id
|
||||||
except IndexError:
|
except IndexError:
|
||||||
user_profile.pointer = -1
|
user_profile.pointer = -1
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["pointer"])
|
||||||
|
|
||||||
print datetime.datetime.now(), "Done replaying old messages"
|
print datetime.datetime.now(), "Done replaying old messages"
|
||||||
|
|
||||||
|
|||||||
@@ -20,4 +20,4 @@ class Command(BaseCommand):
|
|||||||
|
|
||||||
user_profile = get_user_profile_by_email(email)
|
user_profile = get_user_profile_by_email(email)
|
||||||
user_profile.api_key = api_key
|
user_profile.api_key = api_key
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["api_key"])
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ def update_mit_fullnames(change=False):
|
|||||||
print "%s: %s => %s" % (u.email, u.full_name, computed_name)
|
print "%s: %s => %s" % (u.email, u.full_name, computed_name)
|
||||||
if change:
|
if change:
|
||||||
u.full_name = computed_name
|
u.full_name = computed_name
|
||||||
u.save()
|
u.save(update_fields=["full_name"])
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
option_list = BaseCommand.option_list + (
|
option_list = BaseCommand.option_list + (
|
||||||
|
|||||||
@@ -413,8 +413,7 @@ def handle_openid_errors(request, issue, openid_response=None):
|
|||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
# Construct a PreregistrationUser object and send the user over to
|
# Construct a PreregistrationUser object and send the user over to
|
||||||
# the confirmation view.
|
# the confirmation view.
|
||||||
prereg_user = PreregistrationUser()
|
prereg_user = PreregistrationUser(email=google_email)
|
||||||
prereg_user.email = google_email
|
|
||||||
prereg_user.save()
|
prereg_user.save()
|
||||||
return redirect("".join((
|
return redirect("".join((
|
||||||
"/",
|
"/",
|
||||||
@@ -475,8 +474,7 @@ def accounts_home(request):
|
|||||||
form = HomepageForm(request.POST)
|
form = HomepageForm(request.POST)
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
email = form.cleaned_data['email']
|
email = form.cleaned_data['email']
|
||||||
prereg_user = PreregistrationUser()
|
prereg_user = PreregistrationUser(email=email)
|
||||||
prereg_user.email = email
|
|
||||||
prereg_user.save()
|
prereg_user.save()
|
||||||
Confirmation.objects.send_confirmation(prereg_user, email)
|
Confirmation.objects.send_confirmation(prereg_user, email)
|
||||||
return HttpResponseRedirect(reverse('send_confirm', kwargs={'email': email}))
|
return HttpResponseRedirect(reverse('send_confirm', kwargs={'email': email}))
|
||||||
@@ -508,7 +506,7 @@ def home(request):
|
|||||||
# user has since logged in
|
# user has since logged in
|
||||||
if not user_profile.last_reminder is None:
|
if not user_profile.last_reminder is None:
|
||||||
user_profile.last_reminder = None
|
user_profile.last_reminder = None
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["last_reminder"])
|
||||||
|
|
||||||
# Brand new users get the tutorial
|
# Brand new users get the tutorial
|
||||||
needs_tutorial = settings.TUTORIAL_ENABLED and \
|
needs_tutorial = settings.TUTORIAL_ENABLED and \
|
||||||
@@ -1052,7 +1050,7 @@ def json_tutorial_status(request, user_profile, status=REQ('status')):
|
|||||||
user_profile.tutorial_status = UserProfile.TUTORIAL_STARTED
|
user_profile.tutorial_status = UserProfile.TUTORIAL_STARTED
|
||||||
elif status == 'finished':
|
elif status == 'finished':
|
||||||
user_profile.tutorial_status = UserProfile.TUTORIAL_FINISHED
|
user_profile.tutorial_status = UserProfile.TUTORIAL_FINISHED
|
||||||
user_profile.save()
|
user_profile.save(update_fields=["tutorial_status"])
|
||||||
|
|
||||||
return json_success()
|
return json_success()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user