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

jrief · jrief · commit 899402aa0aac · 2026-01-22T16:30:28.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Release history of [django-admin-sortable2](https://github.com/jrief/django-admin-sortable2/)
 
+### 2.3.1
+- fix #370: `django-compress` and `django-sass-processor` raises errors during run of compress or compilescss
+  management command. 
+
 ### 2.3
 - Prepare for Django-6.0.
 - fix #397: Remove Django popup when using list action after dragging items in list view.
diff --git a/adminsortable2/__init__.py b/adminsortable2/__init__.py
@@ -1 +1 @@
-__version__ = '2.3'
+__version__ = '2.3.1'
diff --git a/adminsortable2/templates/adminsortable2/change_list.html b/adminsortable2/templates/adminsortable2/change_list.html
@@ -1,4 +1,4 @@
-{% extends base_change_list_template %}
+{% extends base_change_list_template|default:'admin/change_list.html' %}
 
 {% block extrahead %}
 	{{ block.super }}
diff --git a/testapp/requirements.txt b/testapp/requirements.txt
@@ -22,5 +22,5 @@ requests==2.32.4
 sqlparse==0.5.3
 text-unidecode==1.3
 tomli==2.2.1
-urllib3==2.3.0
+urllib3==2.6.3
 websockets==10.4

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% extends base_change_list_template %}`
	`1`	`+{% extends base_change_list_template\|default:'admin/change_list.html' %}`
`2`	`2`
`3`	`3`	`{% block extrahead %}`
`4`	`4`	`{{ block.super }}`