From 061d61f58095e85eee440bd5e18529d0f14d6b4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Tue, 31 Jan 2023 01:53:12 +0100
Subject: [PATCH] Upgrades for Wagtail 4.1
---
district/templates/district/base.html | 3 +++
districts/templates/districts/base.html | 3 +++
donate/models.py | 16 ++++++++--------
donate/templates/donate/base.html | 3 +++
elections2021/models.py | 8 ++++----
green_deal/templates/green_deal/base.html | 3 +++
main/templates/main/base.html | 3 +++
senat_campaign/models.py | 8 ++++----
senate/templates/senate/base.html | 3 +++
tuning/static/majak/css/tuning.css | 4 ----
uniweb/templates/uniweb/base.html | 3 +++
11 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/district/templates/district/base.html b/district/templates/district/base.html
index 04ae5e94..c6213642 100644
--- a/district/templates/district/base.html
+++ b/district/templates/district/base.html
@@ -2,6 +2,9 @@
<!doctype html>
<html lang="cs">
<head>
+ {% if request.in_preview_panel %}
+ <base target="_blank">
+ {% endif %}
<!-- Meta -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width" />
diff --git a/districts/templates/districts/base.html b/districts/templates/districts/base.html
index 3eaf69f8..a03dd942 100644
--- a/districts/templates/districts/base.html
+++ b/districts/templates/districts/base.html
@@ -2,6 +2,9 @@
<!doctype html>
<html lang="cs">
<head>
+ {% if request.in_preview_panel %}
+ <base target="_blank">
+ {% endif %}
<!-- Font loader -->
<script type="text/javascript">
diff --git a/donate/models.py b/donate/models.py
index b6be6bb4..bf493a72 100644
--- a/donate/models.py
+++ b/donate/models.py
@@ -42,13 +42,13 @@ class DonateFormMixin(models.Model):
class Meta:
abstract = True
- def serve(self, request):
+ def serve(self, request, *args, **kwargs):
if request.method == "POST":
form = DonateForm(request.POST)
if form.is_valid():
url = form.get_redirect_url()
return redirect(url)
- return super().serve(request)
+ return super().serve(request, *args, **kwargs)
@property
def show_donate_form(self):
@@ -319,7 +319,7 @@ class DonateRegionPage(
content_panels = Page.content_panels + [
FieldPanel("main_title"),
- FieldPanel("body", classname="full"),
+ FieldPanel("body"),
]
promote_panels = make_promote_panels(
@@ -478,7 +478,7 @@ class DonateProjectPage(
"info do přehledu projektů",
),
FieldPanel("date"),
- FieldPanel("body", classname="full"),
+ FieldPanel("body"),
FieldPanel("gallery"),
]
@@ -593,7 +593,7 @@ class DonateTextPage(Page, ExtendedMetadataPageMixin, SubpageMixin, MetadataPage
### PANELS
- content_panels = Page.content_panels + [FieldPanel("body", classname="full")]
+ content_panels = Page.content_panels + [FieldPanel("body")]
promote_panels = make_promote_panels()
@@ -627,7 +627,7 @@ class DonateInfoPage(
### PANELS
- content_panels = Page.content_panels + [FieldPanel("body", classname="full")]
+ content_panels = Page.content_panels + [FieldPanel("body")]
promote_panels = make_promote_panels()
@@ -793,7 +793,7 @@ class DonateSecretPreviewPage(Page):
verbose_name = "Skrytá stránka pro náhled konceptu"
def get_context(self, request, *args, **kwargs):
- parent_page = self.get_parent().get_latest_revision_as_page()
+ parent_page = self.get_parent().get_latest_revision_as_object()
context = parent_page.get_context(request=request)
context.update({"disable_robots": True})
@@ -801,7 +801,7 @@ class DonateSecretPreviewPage(Page):
return context
def get_template(self, request, *args, **kwargs):
- parent_page = self.get_parent().get_latest_revision_as_page()
+ parent_page = self.get_parent().get_latest_revision_as_object()
return parent_page.get_template(request, *args, **kwargs)
def serve(self, request, *args, **kwargs):
diff --git a/donate/templates/donate/base.html b/donate/templates/donate/base.html
index ec555c97..f9fe412e 100644
--- a/donate/templates/donate/base.html
+++ b/donate/templates/donate/base.html
@@ -2,6 +2,9 @@
<!doctype html>
<html lang="cs">
<head>
+ {% if request.in_preview_panel %}
+ <base target="_blank">
+ {% endif %}
<!-- Font loader -->
<script type="text/javascript">
diff --git a/elections2021/models.py b/elections2021/models.py
index 59f5fff9..f7e2da65 100644
--- a/elections2021/models.py
+++ b/elections2021/models.py
@@ -2082,7 +2082,7 @@ class Elections2021ProgramAppPage(SubpageMixin, MetadataPageMixin, Page):
class Meta:
verbose_name = "Programová aplikace"
- def serve(self, request):
+ def serve(self, request, *args, **kwargs):
if request.method == "POST":
form = ProgramAppForm(request.POST)
if form.is_valid():
@@ -2095,7 +2095,7 @@ class Elections2021ProgramAppPage(SubpageMixin, MetadataPageMixin, Page):
httponly=settings.SESSION_COOKIE_HTTPONLY,
)
return response
- return super().serve(request)
+ return super().serve(request, *args, **kwargs)
@staticmethod
def get_my_selection(request):
@@ -2728,7 +2728,7 @@ class Elections2021BannerListPage(
class Meta:
verbose_name = "nabídka plachet"
- def serve(self, request, *a, **kw):
+ def serve(self, request, *args, **kwargs):
if request.method == "POST":
form = BannerForm(request.POST)
form.has_been_saved = False
@@ -2741,7 +2741,7 @@ class Elections2021BannerListPage(
form.has_been_saved = False
request.banner_form = form
- return super().serve(request, *a, **kw)
+ return super().serve(request, *args, **kwargs)
class Elections2021MapPage(SubpageMixin, MetadataPageMixin, Page):
diff --git a/green_deal/templates/green_deal/base.html b/green_deal/templates/green_deal/base.html
index dfafb845..707a975c 100644
--- a/green_deal/templates/green_deal/base.html
+++ b/green_deal/templates/green_deal/base.html
@@ -4,6 +4,9 @@
<!DOCTYPE html>
<html lang="cs-cz">
<head>
+ {% if request.in_preview_panel %}
+ <base target="_blank">
+ {% endif %}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#000"/>
diff --git a/main/templates/main/base.html b/main/templates/main/base.html
index 7c856401..bca61594 100644
--- a/main/templates/main/base.html
+++ b/main/templates/main/base.html
@@ -2,6 +2,9 @@
<!doctype html>
<html lang="cs">
<head>
+ {% if request.in_preview_panel %}
+ <base target="_blank">
+ {% endif %}
<!-- Meta -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width"/>
diff --git a/senat_campaign/models.py b/senat_campaign/models.py
index b92e8bc9..25df95d2 100644
--- a/senat_campaign/models.py
+++ b/senat_campaign/models.py
@@ -147,8 +147,8 @@ class SenatCampaignHomePage(
),
MultiFieldPanel(
[
- FieldPanel("about_left", classname="full"),
- FieldPanel("about_right", classname="full"),
+ FieldPanel("about_left"),
+ FieldPanel("about_right"),
FieldPanel("about_gallery"),
],
heading="kdo jsem",
@@ -363,7 +363,7 @@ class SenatCampaignNewsPage(
content_panels = Page.content_panels + [
FieldPanel("date"),
FieldPanel("perex"),
- FieldPanel("body", classname="full"),
+ FieldPanel("body"),
FieldPanel("photo"),
]
@@ -504,7 +504,7 @@ class SenatCampaignCookiesPage(
### PANELS
content_panels = Page.content_panels + [
- FieldPanel("body", classname="full"),
+ FieldPanel("body"),
]
promote_panels = [
diff --git a/senate/templates/senate/base.html b/senate/templates/senate/base.html
index f2a3b710..bcbab584 100644
--- a/senate/templates/senate/base.html
+++ b/senate/templates/senate/base.html
@@ -2,6 +2,9 @@
<!doctype html>
<html lang="cs">
<head>
+ {% if request.in_preview_panel %}
+ <base target="_blank">
+ {% endif %}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0, shrink-to-fit=no">
{% meta_tags %}
diff --git a/tuning/static/majak/css/tuning.css b/tuning/static/majak/css/tuning.css
index 9fa5733b..e69de29b 100644
--- a/tuning/static/majak/css/tuning.css
+++ b/tuning/static/majak/css/tuning.css
@@ -1,4 +0,0 @@
-/* fix UI on users's groups config */
-#id_groups label {
- width: 100%;
-}
diff --git a/uniweb/templates/uniweb/base.html b/uniweb/templates/uniweb/base.html
index ca461fe2..1949ce77 100644
--- a/uniweb/templates/uniweb/base.html
+++ b/uniweb/templates/uniweb/base.html
@@ -2,6 +2,9 @@
<!doctype html>
<html lang="cs">
<head>
+ {% if request.in_preview_panel %}
+ <base target="_blank">
+ {% endif %}
<!-- Meta -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width" />
--
GitLab