DGNum/gestioCOF
16
2
Fork 2
Code Issues 78 Pull requests 15 Projects Releases 12 Packages Wiki Activity

WIP: Aureplop/kpsul js refactor #501

Draft
delobell wants to merge 215 commits from aureplop/kpsul_js_refactor into master
pull from: aureplop/kpsul_js_refactor
merge into: DGNum:master
Conversation 55 Commits 215 Files changed 19 +3 -5
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 100686457b - Show all commits

8
kfet/views.py
View file

@ -1472,15 +1472,13 @@ def history_json(request):
# Construction de la requête (sur les opérations) pour le prefetch # Construction de la requête (sur les opérations) pour le prefetch
ope_queryset_prefetch = Operation.objects.select_related( ope_queryset_prefetch = Operation.objects.select_related(
'canceled_by__trigramme', 'addcost_for__trigramme', 'canceled_by', 'addcost_for',
'article__name') 'article')
ope_prefetch = Prefetch('opes', ope_prefetch = Prefetch('opes',
queryset=ope_queryset_prefetch) queryset=ope_queryset_prefetch)
transfer_queryset_prefetch = Transfer.objects.select_related( transfer_queryset_prefetch = Transfer.objects.select_related(
'from_acc__trigramme', 'to_acc__trigramme', 'from_acc', 'to_acc', 'canceled_by')
'from_acc__id', 'to_acc__id',
'canceled_by__trigramme')
if accounts: if accounts:
transfer_queryset_prefetch = transfer_queryset_prefetch.filter( transfer_queryset_prefetch = transfer_queryset_prefetch.filter(