Merge branch 'release/0.1.21' into main

bnzk · Oct 16, 2021 · d32cb4b · d32cb4b
2 parents 954f1c0 + 18a8150
commit d32cb4b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,8 +1,13 @@
-==== 0.1.19 (ongoing) ===
+==== 0.1.X (ongoing) ===
 
 - more tests: autopublisher, for example!
 
 
+==== 0.1.21 (2021-10-16) ===
+
+- fixed bug for translation tabs and django 3.2
+
+
 ==== 0.1.20 (2021-06-27) ===
 
 - management commands for easy cms/plugin auth group creation

diff --git a/djangocms_misc/__init__.py b/djangocms_misc/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.1.20'
+__version__ = '0.1.21'
 __author__ = 'benzkji'
diff --git a/djangocms_misc/basic/management/commands/djangocms_misc_add_cms_group.py b/djangocms_misc/basic/management/commands/djangocms_misc_add_cms_group.py
@@ -1,6 +1,4 @@
 import logging
-import os
-import shutil
 
 from django.contrib.auth.models import Group, Permission
 from django.core.management.base import BaseCommand
@@ -28,16 +26,16 @@ def add_arguments(self, parser):
             action='store_const',
             const=True,
             default=False,
-            help="adds exactly 'can publish page' permission)."
-        "")
+            help="adds exactly 'can publish page' permission).",
+        )
         parser.add_argument(
             '--cms-superuser',
             required=False,
             action='store_const',
             const=True,
             default=False,
-            help="Superuser CMS permissions (add own users, page permissions, etc, etc)."
-        "")
+            help="Superuser CMS permissions (add own users, page permissions, etc, etc).",
+        )
         parser.add_argument(
             '--plugin',
             required=False,

diff --git a/djangocms_misc/basic/management/commands/djangocms_misc_add_groups.py b/djangocms_misc/basic/management/commands/djangocms_misc_add_groups.py
@@ -1,11 +1,5 @@
-import logging
-import os
-import shutil
-
-from django.contrib.auth.models import Group, Permission
 from django.core.management import call_command
 from django.core.management.base import BaseCommand
-from django.db.models import Q
 
 
 class Command(BaseCommand):

diff --git a/...cms_misc/basic/templates/admin/djangocms_misc/modeltranslation_lang_tabs_change_form.html b/...cms_misc/basic/templates/admin/djangocms_misc/modeltranslation_lang_tabs_change_form.html
@@ -1,5 +1,7 @@
 {% extends 'admin/change_form.html' %}
-{% load i18n admin_static admin_modify cms_admin %}
+{% load i18n static admin_modify cms_admin %}
+
+
 {% block extrahead %}{{ block.super }}
 <script src="{% static 'admin/djangocms_misc/js/language_tabs.js' %}" type="text/javascript"></script>
 <link href="{% static 'admin/djangocms_misc/css/language_tabs.css' %}" rel="stylesheet" type="text/css">

diff --git a/yarn.lock b/yarn.lock
@@ -2109,9 +2109,9 @@ path-is-absolute@^1.0.0:
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"