From 02a015e633c6d3ff3f68d2acebeb39adcdc7a52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= Date: Tue, 16 May 2017 17:08:51 +0200 Subject: [PATCH] fix data sent to ws by perform_transfers --- kfet/views.py | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/kfet/views.py b/kfet/views.py index 6751d95b..ea191ce3 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -1799,22 +1799,27 @@ def perform_transfers(request): websocket_data['opegroups'] = [{ 'add': True, 'modelname': 'transfergroup', - 'id': transfergroup.pk, - 'at': transfergroup.at, - 'comment': transfergroup.comment, - 'valid_by__trigramme': (transfergroup.valid_by and - transfergroup.valid_by.trigramme or None), - 'opes': [], + 'content': { + 'id': transfergroup.pk, + 'at': transfergroup.at, + 'comment': transfergroup.comment, + 'valid_by__trigramme': (transfergroup.valid_by and + transfergroup.valid_by.trigramme or None), + 'children': [] + }, }] for transfer in transfers: ope_data = { - 'id': transfer.pk, - 'amount': transfer.amount, - 'from_acc': transfer.from_acc.trigramme, - 'to_acc': transfer.to_acc.trigramme, - 'canceled_by__trigramme': None, 'canceled_at': None, + 'modelname': 'transfer', + 'content': { + 'id': transfer.pk, + 'amount': transfer.amount, + 'from_acc': transfer.from_acc.trigramme, + 'to_acc': transfer.to_acc.trigramme, + 'canceled_by__trigramme': None, 'canceled_at': None, + }, } - websocket_data['opegroups'][0]['opes'].append(ope_data) + websocket_data['opegroups'][0]['content']['children'].append(ope_data) consumers.KPsul.group_send('kfet.kpsul', websocket_data) return JsonResponse(data)