Evolve requirements

config/settings/base.py

@@ -18,6 +18,8 @@
 USE_L10N = True
 USE_TZ = True
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+
 # DATABASES
 # ------------------------------------------------------------------------------
 DATABASES = {
@@ -36,6 +38,7 @@
 # APPS
 # ------------------------------------------------------------------------------
 DJANGO_APPS = [
+    'django.contrib.postgres',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -51,17 +54,16 @@
     'wagtail.contrib.redirects',
     'wagtail.embeds',
     'wagtail.sites',
-    'wagtail.users',
+    'mpicms.users.apps.CustomWagtailUsersAppConfig',
     'wagtail.snippets',
     'wagtail.documents',
     'wagtail.images',
     'wagtail.search',
     'wagtail.admin',
-    'wagtail.core',
-    'wagtail.contrib.postgres_search',
+    'wagtail',
     'wagtail.contrib.search_promotions',
     'wagtail.contrib.table_block',
-    'wagtail.contrib.modeladmin',
+    'wagtail_modeladmin',
     'wagtail.api.v2',
     'wagtailorderable',
 
@@ -235,16 +237,12 @@
 
 # WAGTAIL
 WAGTAIL_SITE_NAME = 'MPI CMS'
-# WAGTAIL_USER_EDIT_FORM = 'mpicms.users.forms.CustomUserEditForm'
-# WAGTAIL_USER_CREATION_FORM = 'mpicms.users.forms.CustomUserCreationForm'
-# WAGTAIL_USER_CUSTOM_FIELDS = ['phone', 'office']
-
-WAGTAIL_USER_EDIT_FORM = 'users.forms.UserEditForm'
+WAGTAILADMIN_BASE_URL = "https://intranet.molgen.mpg.de"
 
 # SEARCH
 WAGTAILSEARCH_BACKENDS = {
     'default': {
-        'BACKEND': 'wagtail.contrib.postgres_search.backend',
+        'BACKEND': 'wagtail.search.backends.database',
     }
 }
 

config/settings/local.py

@@ -10,6 +10,7 @@
     "localhost",
     "0.0.0.0",
     "127.0.0.1",
+    "intranet.molgen.mpg.de",
 ]
 
 # CACHES
@@ -24,6 +25,9 @@
 # TEMPLATES
 # ------------------------------------------------------------------------------
 TEMPLATES[0]['OPTIONS']['debug'] = DEBUG  # noqa F405
+SILENCED_SYSTEM_CHECKS = [
+    "debug_toolbar.W006",  # See https://github.com/django-commons/django-debug-toolbar/issues/1550
+]
 
 # EMAIL
 # ------------------------------------------------------------------------------
@@ -43,6 +47,7 @@
 DEBUG_TOOLBAR_CONFIG = {
     'DISABLE_PANELS': [
         'debug_toolbar.panels.redirects.RedirectsPanel',
+        'debug_toolbar.panels.profiling.ProfilingPanel',
     ],
     'SHOW_TEMPLATE_CONTEXT': True,
 }

config/urls.py

@@ -1,6 +1,6 @@
 from wagtail.admin import urls as wagtailadmin_urls
 from wagtail.documents import urls as wagtaildocs_urls
-from wagtail.core import urls as wagtail_urls
+from wagtail import urls as wagtail_urls
 from wagtail.contrib.sitemaps.views import sitemap
 
 from django.conf import settings
@@ -9,6 +9,7 @@
 from django.conf.urls.i18n import i18n_patterns
 from django.conf.urls.static import static
 from django.views import defaults as default_views, static as static_views
+from django.views.generic import RedirectView
 
 from mpicms.base.views import search, LogoutView, account, add_subpage, subscribe, unsubscribe
 from mpicms.base.api import api_router
@@ -19,6 +20,7 @@
 
 
 urlpatterns = [
+    path('favicon.ico', RedirectView.as_view(url='/static/favicon/favicon.ico', permanent=True)),
     path('django-admin', admin.site.urls),
     path('i18n/', include('django.conf.urls.i18n')),
     path('search', search, name='search'),