Merge branch 'release-1.12.5'

otto-torino · Dec 1, 2020 · c3c7784 · c3c7784
2 parents f531997 + 5087298
commit c3c7784
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 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.4",
+  "version": "1.12.5",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/core/Menu.js b/baton/static/baton/app/src/core/Menu.js
@@ -175,7 +175,12 @@ let Menu = {
     data.forEach((voice, index) => {
       let active = false
       if (voice.type === 'free') {
-        active = location.pathname === voice.url
+        if (voice.re) {
+          let re = new RegExp(voice.re)
+          active = re.test(location.pathname)
+        } else {
+          active = location.pathname === voice.url
+        }
       } else {
         if (voice.url) {
           let pathRexp = new RegExp(voice.url)

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.4'
+version = u'1.12.5'
 # The full version, including alpha/beta/rc tags.
-release = u'1.12.4'
+release = u'1.12.5'
 
 # 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.4',
+    version='1.12.5',
     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