diff --git a/kfet/static/kfet/js/kfet.api.js b/kfet/static/kfet/js/kfet.api.js index 31221a1f..b1e8a2e7 100644 --- a/kfet/static/kfet/js/kfet.api.js +++ b/kfet/static/kfet/js/kfet.api.js @@ -635,8 +635,8 @@ class HistoryGroup extends ModelObject { */ static compare(a, b) { //Groups are sorted by most recent first - if (a.at < b.at) return 1; - else if (a.at > b.at) return -1; + if (a.at.isBefore(b.at)) return 1; + else if (a.at.isAfter(b.at)) return -1; else return 0; } diff --git a/kfet/views.py b/kfet/views.py index bdb5c1e1..de3ac145 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -1502,6 +1502,7 @@ def history_json(request): 'id': transfergroup.at.strftime('%Y%m%d'), 'date': transfergroup.at }, + 'child_sort': 'transfergroup', }, 'children': [], } @@ -1604,14 +1605,10 @@ class SettingsUpdate(SuccessMessageMixin, UpdateView): # Transfer views # ----- + @teamkfet_required def transfers(request): - transfergroups = (TransferGroup.objects - .prefetch_related('transfers') - .order_by('-at')) - return render(request, 'kfet/transfers.html', { - 'transfergroups': transfergroups, - }) + return render(request, 'kfet/transfers.html') @teamkfet_required def transfers_create(request):