Merge branch 'master' of github.com:jrief/django-admin-sortable2

Author: jrief

.gitignore

@@ -8,6 +8,8 @@
 .DS_Store
 .tmp*
 .tox
+.venv
+env
 local_settings.py
 build
 docs/_build

.travis.yml

@@ -1,21 +1,16 @@
 dist: xenial
 language: python
 python:
-  - 2.7
-  - 3.4
-  - 3.5
   - 3.6
   - 3.7
   - 3.8
+  - 3.9
 
 env:
-  - DJANGO="django<1.11"
-  - DJANGO="django<2.0"
-  - DJANGO="django<2.1"
-  - DJANGO="django<2.2"
   - DJANGO="django<2.3"
   - DJANGO="django<3.1"
   - DJANGO="django<3.2"
+  - DJANGO="django<3.3"
   - DJANGO='https://github.com/django/django/archive/master.tar.gz'
 
 install:
@@ -26,38 +21,8 @@ script:
   - cd example/ && ./manage.py test testapp --settings=testapp.settings
 
 matrix:
-  exclude:
-    - python: 2.7
-      env: DJANGO="django<2.1"
-    - python: 2.7
-      env: DJANGO="django<2.2"
-    - python: 2.7
-      env: DJANGO="django<2.3"
-    - python: 2.7
-      env: DJANGO="django<3.1"
-    - python: 2.7
-      env: DJANGO="django<3.2"
-    - python: 2.7
-      env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
-    - python: 3.4
-      env: DJANGO="django<2.3"
-    - python: 3.4
-      env: DJANGO="django<3.1"
-    - python: 3.4
-      env: DJANGO="django<3.2"
-    - python: 3.4
-      env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
-    - python: 3.5
-      env: DJANGO="django<3.1"
-    - python: 3.5
-      env: DJANGO="django<3.2"
-    - python: 3.5
-      env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
-    - python: 3.8
-      env: DJANGO="django<1.11"
-    - python: 3.8
-      env: DJANGO="django<2.0"
-    - python: 3.8
-      env: DJANGO="django<2.1"
   allow_failures:
      - env: DJANGO='https://github.com/django/django/archive/master.tar.gz'
+  exclude:
+    - python: 3.9
+      env: DJANGO="django<2.3"

adminsortable2/__init__.py

@@ -1 +1 @@
-__version__ = '0.7.7'
+__version__ = '0.7.8'

adminsortable2/admin.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import os
 import json
 from itertools import chain
@@ -15,7 +12,7 @@
 else:
     from django.utils.translation import ugettext_lazy as _
 from django.utils.safestring import mark_safe
-from django.conf.urls import url
+from django.urls import path
 from django.contrib import admin, messages
 from django.core.exceptions import ImproperlyConfigured
 from django.core.paginator import EmptyPage
@@ -34,6 +31,13 @@
 from django.http import (
     HttpResponse, HttpResponseBadRequest,
     HttpResponseNotAllowed, HttpResponseForbidden)
+from django.contrib.contenttypes.models import ContentType
+from django.contrib.contenttypes.forms import (
+    BaseGenericInlineFormSet,
+)
+from django.contrib.contenttypes.admin import (
+    GenericStackedInline, GenericTabularInline
+)
 
 __all__ = ['SortableAdminMixin', 'SortableInlineAdminMixin']
 
@@ -82,7 +86,7 @@ def media(self):
             'adminsortable2/js/libs/jquery.ui.touch-punch-0.2.3.js',
             'adminsortable2/js/libs/jquery.ui.sortable-1.11.4.js',
         ]
-        return super(SortableAdminBase, self).media + widgets.Media(css=css, js=js)
+        return super().media + widgets.Media(css=css, js=js)
 
 
 class SortableAdminMixin(SortableAdminBase):
@@ -101,7 +105,7 @@ def change_list_template(self):
 
     def __init__(self, model, admin_site):
         self.default_order_direction, self.default_order_field = _get_default_ordering(model, self)
-        super(SortableAdminMixin, self).__init__(model, admin_site)
+        super().__init__(model, admin_site)
         self.enable_sorting = False
         self.order_by = None
         if not isinstance(self.exclude, (list, tuple)):
@@ -141,14 +145,16 @@ def _get_update_url_name(self):
 
     def get_urls(self):
         my_urls = [
-            url(r'^adminsortable2_update/$',
+            path(
+                'adminsortable2_update/',
                 self.admin_site.admin_view(self.update_order),
-                name=self._get_update_url_name()),
+                name=self._get_update_url_name()
+            ),
         ]
-        return my_urls + super(SortableAdminMixin, self).get_urls()
+        return my_urls + super().get_urls()
 
     def get_actions(self, request):
-        actions = super(SortableAdminMixin, self).get_actions(request)
+        actions = super().get_actions(request)
         paginator = self.get_paginator(request, self.get_queryset(request), self.list_per_page)
         if len(paginator.page_range) > 1 and 'all' not in request.GET and self.enable_sorting:
             # add actions for moving items to other pages
@@ -173,7 +179,7 @@ def get_changelist(self, request, **kwargs):
             self.order_by = "{}{}".format(first_order_direction, self.default_order_field)
         else:
             self.enable_sorting = False
-        return super(SortableAdminMixin, self).get_changelist(request, **kwargs)
+        return super().get_changelist(request, **kwargs)
 
     def _get_first_ordering(self, request):
         """
@@ -200,7 +206,7 @@ def _get_first_ordering(self, request):
 
     @property
     def media(self):
-        m = super(SortableAdminMixin, self).media
+        m = super().media
         if self.enable_sorting:
             m = m + widgets.Media(js=[
                 'adminsortable2/js/libs/jquery.ui.sortable-1.11.4.js',
@@ -249,7 +255,7 @@ def update_order(self, request):
     def save_model(self, request, obj, form, change):
         if not change:
             setattr(obj, self.default_order_field, self.get_max_order(request, obj) + 1)
-        super(SortableAdminMixin, self).save_model(request, obj, form, change)
+        super().save_model(request, obj, form, change)
 
     def move_to_exact_page(self, request, queryset):
         self._bulk_move(request, queryset, self.EXACT)
@@ -406,7 +412,7 @@ def changelist_view(self, request, extra_context=None):
 
         extra_context['sortable_update_url'] = self.get_update_url(request)
         extra_context['default_order_direction'] = self.default_order_direction
-        return super(SortableAdminMixin, self).changelist_view(request, extra_context)
+        return super().changelist_view(request, extra_context)
 
     def get_update_url(self, request):
         """
@@ -426,7 +432,7 @@ def get_max_order(self, request, obj=None):
         return self.base_model.objects.aggregate(max_order=Coalesce(Max(self.default_order_field), 0))['max_order']
 
 
-class CustomInlineFormSet(BaseInlineFormSet):
+class CustomInlineFormSetMixin():
     def __init__(self, *args, **kwargs):
         self.default_order_direction, self.default_order_field = _get_default_ordering(self.model, self)
 
@@ -437,7 +443,11 @@ def __init__(self, *args, **kwargs):
         self.form.base_fields[self.default_order_field].required = False
         self.form.base_fields[self.default_order_field].widget = widgets.HiddenInput()
 
-        super(CustomInlineFormSet, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
+
+    def get_max_order(self):
+        query_set = self.model.objects.filter(**{self.fk.get_attname(): self.instance.pk})
+        return query_set.aggregate(max_order=Coalesce(Max(self.default_order_field), 0))['max_order']
 
     def save_new(self, form, commit=True):
         """
@@ -446,11 +456,11 @@ def save_new(self, form, commit=True):
         Strange behaviour when field has a default, this might be evaluated on new object and the value
         will be not None, but the default value.
         """
-        obj = super(CustomInlineFormSet, self).save_new(form, commit=False)
+        obj = super().save_new(form, commit=False)
+
         default_order_field = getattr(obj, self.default_order_field, None)
         if default_order_field is None or default_order_field >= 0:
-            query_set = self.model.objects.filter(**{self.fk.get_attname(): self.instance.pk})
-            max_order = query_set.aggregate(max_order=Coalesce(Max(self.default_order_field), 0))['max_order']
+            max_order = self.get_max_order()
             setattr(obj, self.default_order_field, max_order + 1)
         if commit:
             obj.save()
@@ -459,12 +469,14 @@ def save_new(self, form, commit=True):
             form.save_m2m()
         return obj
 
+class CustomInlineFormSet(CustomInlineFormSetMixin, BaseInlineFormSet):
+    pass
 
 class SortableInlineAdminMixin(SortableAdminBase):
     formset = CustomInlineFormSet
 
     def get_fields(self, request, obj=None):
-        fields = super(SortableInlineAdminMixin, self).get_fields(request, obj)
+        fields = super().get_fields(request, obj)
         _, default_order_field = _get_default_ordering(self.model, self)
         fields = list(fields)
 
@@ -488,25 +500,52 @@ def get_fields(self, request, obj=None):
 
         return fields
 
+    @property
+    def is_stacked(self):
+        return isinstance(self, admin.StackedInline)
+
+    @property
+    def is_tabular(self):
+        return isinstance(self, admin.TabularInline)
+
     @property
     def media(self):
         shared = (
-            super(SortableInlineAdminMixin, self).media
-            + widgets.Media(js=('adminsortable2/js/libs/jquery.ui.sortable-1.11.4.js',
-                                'adminsortable2/js/inline-sortable.js')))
+            super().media + widgets.Media(
+                js=('adminsortable2/js/libs/jquery.ui.sortable-1.11.4.js',
+                    'adminsortable2/js/inline-sortable.js')))
         if isinstance(self, admin.StackedInline):
             return shared + widgets.Media(
                 js=('adminsortable2/js/inline-sortable.js',
                     'adminsortable2/js/inline-stacked.js'))
-        if isinstance(self, admin.TabularInline):
+        else:
+            # assume TabularInline (don't return None in any case)
             return shared + widgets.Media(
                 js=('adminsortable2/js/inline-sortable.js',
                     'adminsortable2/js/inline-tabular.js'))
 
     @property
     def template(self):
-        if isinstance(self, admin.StackedInline):
+        if self.is_stacked:
             return 'adminsortable2/stacked.html'
-        if isinstance(self, admin.TabularInline):
+        elif self.is_tabular:
             return 'adminsortable2/tabular.html'
         raise ImproperlyConfigured('Class {0}.{1} must also derive from admin.TabularInline or admin.StackedInline'.format(self.__module__, self.__class__))
+
+
+class CustomGenericInlineFormSet(CustomInlineFormSetMixin, BaseGenericInlineFormSet):
+    def get_max_order(self):
+        query_set = self.model.objects.filter(**{self.ct_fk_field.name: self.instance.pk,
+            self.ct_field.name: ContentType.objects.get_for_model(self.instance, for_concrete_model=self.for_concrete_model)})
+        return query_set.aggregate(max_order=Coalesce(Max(self.default_order_field), 0))['max_order']
+
+class SortableGenericInlineAdminMixin(SortableInlineAdminMixin):
+    formset = CustomGenericInlineFormSet
+
+    @property
+    def is_stacked(self):
+        return isinstance(self, GenericStackedInline)
+
+    @property
+    def is_tabular(self):
+        return isinstance(self, GenericTabularInline)

adminsortable2/locale/it/LC_MESSAGES/django.mo

@@ -7,60 +7,61 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-06 17:55+0200\n"
-"PO-Revision-Date: 2015-05-19 15:43+0100\n"
+"POT-Creation-Date: 2020-12-09 21:24+0100\n"
+"PO-Revision-Date: 2020-12-09 21:49+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"X-Generator: Poedit 1.7.6\n"
+"X-Generator: Poedit 2.3\n"
 
-#: admin.py:127 templates/adminsortable/tabular-1.5.html:9
-#: templates/adminsortable/tabular-1.6.html:9
+#: admin.py templates/adminsortable2/tabular.html
 msgid "Sort"
 msgstr "Ordinamento"
 
-#: admin.py:151
-msgid "Move selected to previous page"
+#: admin.py
+msgid "Move selected to specific page"
+msgstr "Spostare selezione alla pagina specifica"
+
+#: admin.py
+msgid "Move selected ... pages back"
 msgstr "Spostare selezione alla pagina precedente"
 
-#: admin.py:155
-msgid "Move selected to next page"
+#: admin.py
+msgid "Move selected ... pages forward"
 msgstr "Spostare selezione alla pagina successiva"
 
-#: admin.py:159
+#: admin.py
 msgid "Move selected to first page"
 msgstr "Spostare selezione alla prima pagina"
 
-#: admin.py:163
+#: admin.py
 msgid "Move selected to last page"
 msgstr "Spostare selezione all'ultima pagina"
 
-#: templates/adminsortable/stacked-1.5.html:10
-#: templates/adminsortable/stacked-1.6.html:10
-#: templates/adminsortable/tabular-1.5.html:31
-#: templates/adminsortable/tabular-1.6.html:31
+#: admin.py
+msgid "The target page size is {}. It is too small for {} items."
+msgstr "La dimensione della pagina di destinazione è {}. È troppo piccolo per {} articoli."
+
+#: templates/adminsortable2/stacked.html templates/adminsortable2/tabular.html
+msgid "Change"
+msgstr "Modifica"
+
+#: templates/adminsortable2/stacked.html templates/adminsortable2/tabular.html
 msgid "View on site"
 msgstr "Vedi sul sito"
 
-#: templates/adminsortable/stacked-1.5.html:28
-#: templates/adminsortable/stacked-1.6.html:28
-#: templates/adminsortable/tabular-1.5.html:78
-#: templates/adminsortable/tabular-1.6.html:77
+#: templates/adminsortable2/stacked.html templates/adminsortable2/tabular.html
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: templates/adminsortable/stacked-1.5.html:29
-#: templates/adminsortable/stacked-1.6.html:29
-#: templates/adminsortable/tabular-1.5.html:77
-#: templates/adminsortable/tabular-1.6.html:76
+#: templates/adminsortable2/stacked.html templates/adminsortable2/tabular.html
 #, python-format
 msgid "Add another %(verbose_name)s"
 msgstr "Aggiungi un altro %(verbose_name)s"
 
-#: templates/adminsortable/tabular-1.5.html:17
-#: templates/adminsortable/tabular-1.6.html:17
+#: templates/adminsortable2/tabular.html
 msgid "Delete?"
 msgstr "Eliminare?"

adminsortable2/locale/it/LC_MESSAGES/django.po

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

adminsortable2/management/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

adminsortable2/management/commands/__init__.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.apps import apps
 from django.core.management.base import BaseCommand, CommandError