diff --git a/.isort.cfg b/.isort.cfg index e5972edcd2f1d5696915870464e60f5d3bee1938..2f6cd78cd74f366eeb3e0935312c81f2b9d25fc8 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -3,4 +3,4 @@ line_length = 88 multi_line_output = 3 include_trailing_comma = true -known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,tweepy,wagtail,wagtail_transfer,wagtailmetadata,weasyprint,yaml +known_third_party = PyPDF2,arrow,bleach,bs4,captcha,celery,dateutil,django,environ,faker,fastjsonschema,icalevnt,markdown,modelcluster,pirates,pytest,pytz,requests,sentry_sdk,taggit,tweepy,wagtail,wagtailmetadata,weasyprint,yaml diff --git a/Dockerfile b/Dockerfile index 9a8045fdfc43b5dee7e6e59e056a82514bad6a87..08b4f2b321dfd2eae3e6794ff3c80b6039e53f82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,6 @@ ENV DJANGO_SETTINGS_MODULE "majak.settings.production" # fake values for required env variables used to run collectstatic during build RUN DJANGO_SECRET_KEY=x DATABASE_URL=postgres://x/x DJANGO_ALLOWED_HOSTS=x \ OIDC_RP_CLIENT_ID=x OIDC_RP_CLIENT_SECRET=x OIDC_RP_REALM_URL=x \ - WAGTAILTRANSFER_SECRET_KEY=x \ python manage.py collectstatic EXPOSE 8000 diff --git a/README.md b/README.md index 259a00323c34305aa518f0c8b09eddffd7c9438f..0b4ba971a430081f2c937221a5a8bc7f9142d236 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,6 @@ V produkci musí být navíc nastaveno: | `DJANGO_ALLOWED_HOSTS` | | allowed hosts (více hodnot odděleno čárkami) | | `CELERY_BROKER_URL` | | URL pro Celery Broker | | `CELERY_RESULT_BACKEND` | | URL pro Celery Result Backend | -| `WAGTAILTRANSFER_SECRET_KEY` | | tajný klíč pro transfer stránek | Různé: @@ -158,7 +157,6 @@ Různé: | `SENTRY_DSN` | | pokud je zadáno, pády se reportují do Sentry | | `SEARCH_CONFIG` | english | nastavení jazyka fulltextového vyhledávání, viz níže | | `DEBUG_TOOLBAR` | False | zobrazit Django Debug Toolbar (pro vývoj) | -| `WAGTAILTRANSFER_SOURCES` | {} | `dict` s konfigurací zdrojů pro transfer stránek | Settings pro appky na weby: diff --git a/majak/settings/base.py b/majak/settings/base.py index bad6d65ae86347efc42feb9bd71c727f11c9758f..7672ef0c0bdcb4917e1d81f462a6360d9b569c06 100644 --- a/majak/settings/base.py +++ b/majak/settings/base.py @@ -72,7 +72,6 @@ INSTALLED_APPS = [ "wagtail.core", "wagtailmetadata", "wagtail_trash", - "wagtail_transfer", "modelcluster", "taggit", "django_extensions", @@ -260,16 +259,6 @@ WAGTAILEMBEDS_RESPONSIVE_HTML = True BASE_URL = env.str("BASE_URL", default="https://majak.pirati.cz") WAGTAILADMIN_BASE_URL = BASE_URL -# WAGTAIL TRANSFER SETTINGS -# ------------------------------------------------------------------------------ - -WAGTAILTRANSFER_SOURCES = env.json("WAGTAILTRANSFER_SOURCES", default={}) -WAGTAILTRANSFER_UPDATE_RELATED_MODELS = ["wagtailimages.Image", "wagtaildocs.Document"] -WAGTAILTRANSFER_LOOKUP_FIELDS = { - "users.User": ["sso_id"], - "taggit.tag": ["slug"], -} - # CUSTOM SETTINGS # ------------------------------------------------------------------------------ MAJAK_ENV = env.str("MAJAK_ENV", default="prod") diff --git a/majak/settings/dev.py b/majak/settings/dev.py index 84a953fb5f03b47f107bfe593fb77fd0720a2098..a58152a442a061e82da626cfb4b48206bc16561a 100644 --- a/majak/settings/dev.py +++ b/majak/settings/dev.py @@ -8,9 +8,6 @@ SECRET_KEY = env("DJANGO_SECRET_KEY", default="58asda4d6nasd*jkj!dbska83asd54") ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["*"]) INSTALLED_APPS += ["wagtail.contrib.styleguide"] MAJAK_ENV = env.str("MAJAK_ENV", default="dev") -WAGTAILTRANSFER_SECRET_KEY = env.str( - "WAGTAILTRANSFER_SECRET_KEY", default="sfdjhfssah856asjhd" -) # django-debug-toolbar # ------------------------------------------------------------------------------ diff --git a/majak/settings/production.py b/majak/settings/production.py index 36645db30b458f88d571151a222e5f66fd269e39..33c990f1392a335cfba723961c64b16a85d55eca 100644 --- a/majak/settings/production.py +++ b/majak/settings/production.py @@ -18,7 +18,6 @@ SECURE_HSTS_SECONDS = 518400 SECURE_HSTS_INCLUDE_SUBDOMAINS = True SECURE_HSTS_PRELOAD = True SECURE_CONTENT_TYPE_NOSNIFF = True -WAGTAILTRANSFER_SECRET_KEY = env.str("WAGTAILTRANSFER_SECRET_KEY") # TEMPLATES # ------------------------------------------------------------------------------ diff --git a/majak/urls.py b/majak/urls.py index 478994bb7bc86fdf14acd02f18111ed07b23fdc1..7967cf7cf9d35924cc05704c6a229528abb46dba 100644 --- a/majak/urls.py +++ b/majak/urls.py @@ -7,7 +7,6 @@ from wagtail.admin import urls as wagtailadmin_urls from wagtail.contrib.sitemaps.views import sitemap from wagtail.core import urls as wagtail_urls from wagtail.documents import urls as wagtaildocs_urls -from wagtail_transfer import urls as wagtailtransfer_urls from elections2021 import views as elections2021_views from maps_utils import urls as maps_utils_urls @@ -28,7 +27,6 @@ urlpatterns = [ path("captcha/", include(captcha.urls)), path("seznam-webu/", SitesListView.as_view()), path("sitemap.xml", sitemap), - path("wagtail-transfer/", include(wagtailtransfer_urls)), ] + pirates_urlpatterns diff --git a/requirements/base.in b/requirements/base.in index a5ce82ca32ebce87821894b5dd24641e500a3846..0cd088a7fe2c0e5a0ed83397828e20fac0a2532f 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,7 +1,6 @@ wagtail wagtail-metadata wagtail-trash -wagtail-transfer django-environ django-extensions django-redis diff --git a/requirements/base.txt b/requirements/base.txt index 211b0de4062afd42266eb4450d4c811d1a05e429..e07195ba9e7ee5b4ddebb48e2b56fb8a294ecf93 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -272,8 +272,6 @@ wagtail==4.1.1 # wagtail-trash wagtail-metadata==4.0.2 # via -r base.in -wagtail-transfer==0.8.5 - # via -r base.in wagtail-trash==0.3.0 # via -r base.in wcwidth==0.2.6