Skip to content

Commit 15b67fd

Browse files
authored
Merge pull request #404 from fsbraun/fix/calesce-type-error
Fix: `Coalesce` type error as documented here
2 parents 3cbfa1a + 4daef5e commit 15b67fd

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

adminsortable2/admin.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from django.contrib.contenttypes.models import ContentType
1414
from django.core.exceptions import ImproperlyConfigured
1515
from django.core.paginator import EmptyPage
16-
from django.db import router, transaction
16+
from django.db import router, transaction, models
1717
from django.db.models import OrderBy
1818
from django.db.models.aggregates import Max
1919
from django.db.models.expressions import BaseExpression, F
@@ -359,7 +359,7 @@ def get_extra_model_filters(request):
359359

360360
def get_max_order(self, request, obj=None):
361361
return self.model.objects.aggregate(
362-
max_order=Coalesce(Max(self.default_order_field), 0)
362+
max_order=Coalesce(Max(self.default_order_field, output_field=models.IntegerField()), 0),
363363
)['max_order']
364364

365365
def _bulk_move(self, request, queryset, method):
@@ -445,7 +445,8 @@ class PolymorphicSortableAdminMixin(SortableAdminMixin):
445445
"""
446446
def get_max_order(self, request, obj=None):
447447
return self.base_model.objects.aggregate(
448-
max_order=Coalesce(Max(self.default_order_field), 0)
448+
max_order=Coalesce(Max(self.default_order_field, output_field=IntegerField), 0),
449+
output_field=IntegerField,
449450
)['max_order']
450451

451452

0 commit comments

Comments
 (0)