0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

don't wait inside task

Browse source
This commit is contained in:
j 2021-10-08 16:10:44 +01:00
parent 26708eff1f
commit ed31259fdd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/item/tasks.py
View file

@ -367,5 +367,5 @@ def bulk_edit(data, username):
if item.editable(user): if item.editable(user):
with transaction.atomic(): with transaction.atomic():
item.refresh_from_db() item.refresh_from_db()
response = edit_item(user, item, data) response = edit_item(user, item, data, is_task=True)
return {} return {}

4
pandora/item/views.py
View file

@ -533,7 +533,7 @@ def get(request, data):
return render_to_json_response(response) return render_to_json_response(response)
actions.register(get) actions.register(get)
def edit_item(user, item, data): def edit_item(user, item, data, is_task=False):
data = data.copy() data = data.copy()
update_clips = False update_clips = False
response = json_response(status=200, text='ok') response = json_response(status=200, text='ok')
@ -559,7 +559,7 @@ def edit_item(user, item, data):
other_groups = list(groups - user_groups) other_groups = list(groups - user_groups)
data['groups'] = [g for g in data['groups'] if g in user_groups] + other_groups data['groups'] = [g for g in data['groups'] if g in user_groups] + other_groups
r = item.edit(data) r = item.edit(data)
if r: if r and not is_task:
r.wait() r.wait()
if update_clips: if update_clips:
tasks.update_clips.delay(item.public_id) tasks.update_clips.delay(item.public_id)