Merge branch 'hotfix-1.12.1'

otto-torino · Oct 22, 2020 · 7ff53e5 · 7ff53e5
2 parents 1da0d81 + 8e6b254
commit 7ff53e5
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/dist/baton.min.js.map b/baton/static/baton/app/dist/baton.min.js.map
diff --git a/baton/static/baton/app/package-lock.json b/baton/static/baton/app/package-lock.json
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "1.12.0",
+  "version": "1.12.1",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/core/ChangeList.js b/baton/static/baton/app/src/core/ChangeList.js
@@ -17,6 +17,9 @@ let ChangeList = {
     }
   },
   activate: function () {
+    if ($('.changelist-form-container').length) { // django >= 3.1
+      $('#changelist-filter').appendTo($('.changelist-form-container'))
+    }
     if (this.filtersAlwaysOpen) {
       $(document.body).addClass('changelist-filter-active changelist-filter-always-open')
     } else {

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'1.12.0'
+version = u'1.12.1'
 # The full version, including alpha/beta/rc tags.
-release = u'1.12.0'
+release = u'1.12.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='1.12.0',
+    version='1.12.1',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',

diff --git a/testapp/app/db.sqlite3 b/testapp/app/db.sqlite3