Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[django 1.5] Update read flags handling to use new Django 1.5 syntax. 

(imported from commit af1e2608b6d6d3677bf6266980d8dc77739aa4ba)
This commit is contained in:
Tim Abbott 2013-03-13 17:33:24 -04:00
parent 4a91b4a1ea
commit fde2243dbc
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zephyr/lib/actions.py
View File

@ -571,9 +571,9 @@ if settings.USING_RABBITMQ or settings.TEST_SUITE:
to_update = UserMessage.objects.filter(id__in=mids) to_update = UserMessage.objects.filter(id__in=mids)
if operation == "add": if operation == "add":
to_update.update(flags=F('flags') | flagattr) to_update.update(flags=F('flags').bitor(flagattr))
elif operation == "remove": elif operation == "remove":
to_update.update(flags=F('flags') & ~flagattr) to_update.update(flags=F('flags').bitand(~flagattr))
if len(mids) == 0: if len(mids) == 0:
return True return True
@ -630,9 +630,9 @@ def process_update_message_flags(event):
id__lte=until_id) id__lte=until_id)
if op == 'add': if op == 'add':
msgs.update(flags=F('flags') | flagattr) msgs.update(flags=F('flags').bitor(flagattr))
elif op == 'remove': elif op == 'remove':
msgs.update(flags=F('flags') & ~flagattr) msgs.update(flags=F('flags').bitand(~flagattr))
return True return True

4
zephyr/management/commands/set_message_flags.py
View File

@ -66,9 +66,9 @@ class Command(BaseCommand):
with transaction.commit_on_success(): with transaction.commit_on_success():
msgs = UserMessage.objects.filter(id__in=batch) msgs = UserMessage.objects.filter(id__in=batch)
if op == 'add': if op == 'add':
msgs.update(flags=models.F('flags') | flag) msgs.update(flags=models.F('flags').bitor(flag))
elif op == 'remove': elif op == 'remove':
msgs.update(flags=models.F('flags') & ~flag) msgs.update(flags=models.F('flags').bitand(~flag))
if not options["for_real"]: if not options["for_real"]:
logging.info("Updating %s by %s %s" % (mids, op, flag)) logging.info("Updating %s by %s %s" % (mids, op, flag))

2
zephyr/management/commands/set_unread_to_pointer.py
View File

@ -61,7 +61,7 @@ class Command(BaseCommand):
else: else:
def do_update(batch): def do_update(batch):
with transaction.commit_on_success(): with transaction.commit_on_success():
UserMessage.objects.filter(id__in=batch).update(flags=models.F('flags') | UserMessage.flags.read) UserMessage.objects.filter(id__in=batch).update(flags=models.F('flags').bitor(UserMessage.flags.read))
mids = [m.id for m in msgs] mids = [m.id for m in msgs]
utils.run_in_batches(mids, 250, do_update, 3, logging.info) utils.run_in_batches(mids, 250, do_update, 3, logging.info)

2
zephyr/views.py
View File

@ -474,7 +474,7 @@ def update_pointer_backend(request, user_profile,
UserMessage.objects.filter(user_profile=user_profile, UserMessage.objects.filter(user_profile=user_profile,
message__id__lte=pointer, message__id__lte=pointer,
flags=~UserMessage.flags.read) \ flags=~UserMessage.flags.read) \
.update(flags=F('flags') | UserMessage.flags.read) .update(flags=F('flags').bitor(UserMessage.flags.read))
if settings.TORNADO_SERVER: if settings.TORNADO_SERVER:
tornado_callbacks.send_notification(dict( tornado_callbacks.send_notification(dict(