|
13 | 13 | from django.contrib.contenttypes.models import ContentType |
14 | 14 | from django.core.exceptions import ImproperlyConfigured |
15 | 15 | from django.core.paginator import EmptyPage |
16 | | -from django.db import router, transaction |
| 16 | +from django.db import router, transaction, models |
17 | 17 | from django.db.models import OrderBy |
18 | 18 | from django.db.models.aggregates import Max |
19 | 19 | from django.db.models.expressions import BaseExpression, F |
@@ -359,7 +359,7 @@ def get_extra_model_filters(request): |
359 | 359 |
|
360 | 360 | def get_max_order(self, request, obj=None): |
361 | 361 | 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), |
363 | 363 | )['max_order'] |
364 | 364 |
|
365 | 365 | def _bulk_move(self, request, queryset, method): |
@@ -445,7 +445,8 @@ class PolymorphicSortableAdminMixin(SortableAdminMixin): |
445 | 445 | """ |
446 | 446 | def get_max_order(self, request, obj=None): |
447 | 447 | 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, |
449 | 450 | )['max_order'] |
450 | 451 |
|
451 | 452 |
|
|
0 commit comments