Merge pull request #1257 from wger-project/dependabot/pip/django-cris…

…py-forms-approx-eq-2.0

Update django-crispy-forms requirement from ~=1.14 to ~=2.0

requirements.txt

@@ -13,7 +13,8 @@ django-recaptcha~=3.0.0
 Django==4.1.5
 django-activity-stream==1.4.2
 django-axes==5.40.1
-django-crispy-forms~=1.14
+django-crispy-forms~=2.0
+crispy-bootstrap4==2022.1
 django-simple-history~=3.3
 django-email-verification~=0.3.1
 django_compressor~=4.3

wger/settings_global.py

@@ -20,7 +20,6 @@
 import re
 from datetime import timedelta
 
-
 """
 This file contains the global settings that don't usually need to be changed.
 For a full list of options, visit:
@@ -78,6 +77,7 @@
 
     # Form renderer helper
     'crispy_forms',
+    'crispy_bootstrap4',
 
     # REST-API
     'rest_framework',
@@ -165,8 +165,7 @@
                 'django.template.loaders.filesystem.Loader',
                 'django.template.loaders.app_directories.Loader',
             ],
-            'debug':
-            False
+            'debug': False
         },
     },
 ]
@@ -249,7 +248,7 @@
 LANGUAGE_CODE = 'en'
 
 # All translation files are in one place
-LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'), )
+LOCALE_PATHS = (os.path.join(SITE_ROOT, 'locale'),)
 
 # Primary keys are AutoFields
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
@@ -318,6 +317,7 @@
 # Django Crispy Templates
 #
 CRISPY_TEMPLATE_PACK = 'bootstrap4'
+CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap4'
 
 #
 # Easy thumbnails
@@ -423,13 +423,13 @@
 REST_FRAMEWORK = {
     'DEFAULT_PERMISSION_CLASSES': ('wger.utils.permissions.WgerPermission', ),
     'DEFAULT_PAGINATION_CLASS':
-    'rest_framework.pagination.LimitOffsetPagination',
+        'rest_framework.pagination.LimitOffsetPagination',
     'PAGE_SIZE':
-    20,
+        20,
     'PAGINATE_BY_PARAM':
-    'limit',  # Allow client to override, using `?limit=xxx`.
+        'limit',  # Allow client to override, using `?limit=xxx`.
     'TEST_REQUEST_DEFAULT_FORMAT':
-    'json',
+        'json',
     'DEFAULT_AUTHENTICATION_CLASSES': (
         'rest_framework.authentication.SessionAuthentication',
         'rest_framework.authentication.TokenAuthentication',