From 6a8535bb3d7ec4649e41f6f1f1258982ae305cce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Valenta?= <tomas@imaniti.org>
Date: Tue, 2 Jul 2024 07:59:44 +0200
Subject: [PATCH] finish(?) migrations
---
.../0185_alter_districtcustompage_content.py | 4 ++--
...districtcustompage_new_content_and_more.py | 4 ++--
...districtcustompage_new_content_and_more.py | 22 +++++++++----------
...er_districtarticlepage_content_and_more.py | 22 +++++++++----------
...er_districtarticlepage_content_and_more.py | 22 +++++++++----------
...er_districtarticlepage_content_and_more.py | 22 +++++++++----------
.../migrations/0209_auto_20240528_0905.py | 2 +-
...rictcenterpage_sidebar_content_and_more.py | 22 +++++++++----------
.../0232_alter_districtpeoplepage_people.py | 14 ++++++------
.../migrations/0235_auto_20240620_1149.py | 14 ++++++------
..._districtcrossroadpage_content_and_more.py | 14 ++++++------
.../0238_alter_districtcustompage_content.py | 4 ++--
.../0240_alter_districthomepage_content.py | 6 ++---
...er_districtarticlepage_content_and_more.py | 16 +++++++-------
...er_districtarticlepage_content_and_more.py | 16 +++++++-------
.../migrations/0243_auto_20240701_1616.py | 4 ++--
.../migrations/0244_merge_20240702_0752.py | 14 ++++++++++++
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...lter_uniwebarticlepage_content_and_more.py | 12 +++++-----
...lter_uniwebarticlepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
...ter_uniwebflexiblepage_content_and_more.py | 12 +++++-----
uniweb/migrations/0074_merge_20240702_0752.py | 14 ++++++++++++
29 files changed, 198 insertions(+), 170 deletions(-)
create mode 100644 district/migrations/0244_merge_20240702_0752.py
create mode 100644 uniweb/migrations/0074_merge_20240702_0752.py
diff --git a/district/migrations/0185_alter_districtcustompage_content.py b/district/migrations/0185_alter_districtcustompage_content.py
index 6ef9b704..c9c117cd 100644
--- a/district/migrations/0185_alter_districtcustompage_content.py
+++ b/district/migrations/0185_alter_districtcustompage_content.py
@@ -6,7 +6,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -5872,7 +5872,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0187_districtcustompage_new_content_and_more.py b/district/migrations/0187_districtcustompage_new_content_and_more.py
index fac08b4b..1f28826d 100644
--- a/district/migrations/0187_districtcustompage_new_content_and_more.py
+++ b/district/migrations/0187_districtcustompage_new_content_and_more.py
@@ -6,7 +6,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -5983,7 +5983,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0198_remove_districtcustompage_new_content_and_more.py b/district/migrations/0198_remove_districtcustompage_new_content_and_more.py
index 63ccf145..22cbe5a4 100644
--- a/district/migrations/0198_remove_districtcustompage_new_content_and_more.py
+++ b/district/migrations/0198_remove_districtcustompage_new_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -11772,7 +11772,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -17837,7 +17837,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -23941,7 +23941,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -30066,7 +30066,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -36131,7 +36131,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -42196,7 +42196,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -48300,7 +48300,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -54404,7 +54404,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -60508,7 +60508,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -66612,7 +66612,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0199_alter_districtarticlepage_content_and_more.py b/district/migrations/0199_alter_districtarticlepage_content_and_more.py
index 4bf19512..d67852c2 100644
--- a/district/migrations/0199_alter_districtarticlepage_content_and_more.py
+++ b/district/migrations/0199_alter_districtarticlepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -10950,7 +10950,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -16606,7 +16606,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -22301,7 +22301,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -28017,7 +28017,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -33758,7 +33758,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -39414,7 +39414,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -45109,7 +45109,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -50804,7 +50804,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -56584,7 +56584,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -62279,7 +62279,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0200_alter_districtarticlepage_content_and_more.py b/district/migrations/0200_alter_districtarticlepage_content_and_more.py
index 37798f2e..8eb538eb 100644
--- a/district/migrations/0200_alter_districtarticlepage_content_and_more.py
+++ b/district/migrations/0200_alter_districtarticlepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -10744,7 +10744,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -16297,7 +16297,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -21889,7 +21889,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -27502,7 +27502,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -33055,7 +33055,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -38608,7 +38608,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -44200,7 +44200,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -49792,7 +49792,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -55384,7 +55384,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -60976,7 +60976,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0201_alter_districtarticlepage_content_and_more.py b/district/migrations/0201_alter_districtarticlepage_content_and_more.py
index aa7ba4eb..985d70aa 100644
--- a/district/migrations/0201_alter_districtarticlepage_content_and_more.py
+++ b/district/migrations/0201_alter_districtarticlepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -10242,7 +10242,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -15544,7 +15544,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -20885,7 +20885,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -26247,7 +26247,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -31549,7 +31549,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -36851,7 +36851,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -42192,7 +42192,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -47533,7 +47533,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -52874,7 +52874,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -58215,7 +58215,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0209_auto_20240528_0905.py b/district/migrations/0209_auto_20240528_0905.py
index 4e4a4407..699d3148 100644
--- a/district/migrations/0209_auto_20240528_0905.py
+++ b/district/migrations/0209_auto_20240528_0905.py
@@ -5188,7 +5188,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0210_remove_districtcenterpage_sidebar_content_and_more.py b/district/migrations/0210_remove_districtcenterpage_sidebar_content_and_more.py
index d7fe72ed..ea302f4e 100644
--- a/district/migrations/0210_remove_districtcenterpage_sidebar_content_and_more.py
+++ b/district/migrations/0210_remove_districtcenterpage_sidebar_content_and_more.py
@@ -6,7 +6,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -5174,7 +5174,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -10506,7 +10506,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -15839,7 +15839,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -21193,7 +21193,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -26487,7 +26487,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -31781,7 +31781,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -37114,7 +37114,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -42447,7 +42447,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -47780,7 +47780,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -53113,7 +53113,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0232_alter_districtpeoplepage_people.py b/district/migrations/0232_alter_districtpeoplepage_people.py
index f2536292..7779f2d7 100644
--- a/district/migrations/0232_alter_districtpeoplepage_people.py
+++ b/district/migrations/0232_alter_districtpeoplepage_people.py
@@ -10398,7 +10398,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -15786,7 +15786,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -21175,7 +21175,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -26585,7 +26585,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -31974,7 +31974,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -37363,7 +37363,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -42752,7 +42752,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0235_auto_20240620_1149.py b/district/migrations/0235_auto_20240620_1149.py
index 5f4ad383..2d38d1b8 100644
--- a/district/migrations/0235_auto_20240620_1149.py
+++ b/district/migrations/0235_auto_20240620_1149.py
@@ -6,7 +6,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
from district.blocks import PeopleGroupBlock
@@ -5224,7 +5224,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -10600,7 +10600,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -15997,7 +15997,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -21373,7 +21373,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -26749,7 +26749,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -32125,7 +32125,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0236_alter_districtcrossroadpage_content_and_more.py b/district/migrations/0236_alter_districtcrossroadpage_content_and_more.py
index a6da015b..3c576221 100644
--- a/district/migrations/0236_alter_districtcrossroadpage_content_and_more.py
+++ b/district/migrations/0236_alter_districtcrossroadpage_content_and_more.py
@@ -6,7 +6,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -5166,7 +5166,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -10503,7 +10503,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -15861,7 +15861,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -21198,7 +21198,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -26535,7 +26535,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -31872,7 +31872,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0238_alter_districtcustompage_content.py b/district/migrations/0238_alter_districtcustompage_content.py
index 7c964018..18a6511d 100644
--- a/district/migrations/0238_alter_districtcustompage_content.py
+++ b/district/migrations/0238_alter_districtcustompage_content.py
@@ -6,7 +6,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -5166,7 +5166,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0240_alter_districthomepage_content.py b/district/migrations/0240_alter_districthomepage_content.py
index 091b5bda..dddf3738 100644
--- a/district/migrations/0240_alter_districthomepage_content.py
+++ b/district/migrations/0240_alter_districthomepage_content.py
@@ -5,12 +5,12 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.main
+import shared.blocks
class Migration(migrations.Migration):
dependencies = [
- ("district", "0240_alter_districthomepage_content"),
+ ("district", "0239_districthomepage_custom_css"),
]
operations = [
@@ -204,7 +204,7 @@ class Migration(migrations.Migration):
(
"list",
wagtail.blocks.ListBlock(
- shared.blocks.main.BoxBlock, label="Boxíky"
+ shared.blocks.PersonContactBoxBlock, label="Boxíky"
),
),
],
diff --git a/district/migrations/0241_alter_districtarticlepage_content_and_more.py b/district/migrations/0241_alter_districtarticlepage_content_and_more.py
index 05a6a152..2410a8d4 100644
--- a/district/migrations/0241_alter_districtarticlepage_content_and_more.py
+++ b/district/migrations/0241_alter_districtarticlepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -10414,7 +10414,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -15831,7 +15831,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -21253,7 +21253,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -26712,7 +26712,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -32134,7 +32134,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -37556,7 +37556,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -42978,7 +42978,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0242_alter_districtarticlepage_content_and_more.py b/district/migrations/0242_alter_districtarticlepage_content_and_more.py
index c74b8e26..8b225060 100644
--- a/district/migrations/0242_alter_districtarticlepage_content_and_more.py
+++ b/district/migrations/0242_alter_districtarticlepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -10528,7 +10528,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -16002,7 +16002,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -21481,7 +21481,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -26997,7 +26997,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -32476,7 +32476,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -37955,7 +37955,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -43434,7 +43434,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/district/migrations/0243_auto_20240701_1616.py b/district/migrations/0243_auto_20240701_1616.py
index 2ca8d216..cbfc20ed 100644
--- a/district/migrations/0243_auto_20240701_1616.py
+++ b/district/migrations/0243_auto_20240701_1616.py
@@ -4,7 +4,7 @@ from django.db import migrations
def fix_menu(apps, schema_editor):
- from district.models import DistrictHomePage
+ DistrictHomePage = apps.get_model("district", "DistrictHomePage")
for page in DistrictHomePage.objects.all():
if page.title == "Piráti Pardubicko":
@@ -14,7 +14,7 @@ def fix_menu(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
- ("district", "0242_alter_districthomepage_content"),
+ ("district", "0242_alter_districtarticlepage_content_and_more"),
]
operations = [migrations.RunPython(fix_menu)]
diff --git a/district/migrations/0244_merge_20240702_0752.py b/district/migrations/0244_merge_20240702_0752.py
new file mode 100644
index 00000000..86ec4845
--- /dev/null
+++ b/district/migrations/0244_merge_20240702_0752.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.0.6 on 2024-07-02 05:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('district', '0240_alter_districthomepage_content'),
+ ('district', '0243_auto_20240701_1616'),
+ ]
+
+ operations = [
+ ]
diff --git a/uniweb/migrations/0055_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0055_alter_uniwebflexiblepage_content_and_more.py
index 997be8fa..e0ff436a 100644
--- a/uniweb/migrations/0055_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0055_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -544,7 +544,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1176,7 +1176,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1787,7 +1787,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2398,7 +2398,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3009,7 +3009,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0056_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0056_alter_uniwebflexiblepage_content_and_more.py
index ac042634..08091083 100644
--- a/uniweb/migrations/0056_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0056_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -546,7 +546,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1180,7 +1180,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1793,7 +1793,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2406,7 +2406,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3019,7 +3019,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0057_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0057_alter_uniwebflexiblepage_content_and_more.py
index c744441d..02d5afd7 100644
--- a/uniweb/migrations/0057_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0057_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -572,7 +572,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1232,7 +1232,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1871,7 +1871,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2510,7 +2510,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3149,7 +3149,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0058_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0058_alter_uniwebflexiblepage_content_and_more.py
index 1c920ff1..7f126c13 100644
--- a/uniweb/migrations/0058_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0058_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -572,7 +572,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1232,7 +1232,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1871,7 +1871,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2510,7 +2510,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3149,7 +3149,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0059_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0059_alter_uniwebflexiblepage_content_and_more.py
index 7b329a83..aec8ba6c 100644
--- a/uniweb/migrations/0059_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0059_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -573,7 +573,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1234,7 +1234,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1874,7 +1874,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2514,7 +2514,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3154,7 +3154,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0060_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0060_alter_uniwebflexiblepage_content_and_more.py
index d62c08ec..8e805e94 100644
--- a/uniweb/migrations/0060_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0060_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -573,7 +573,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1301,7 +1301,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2008,7 +2008,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2715,7 +2715,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3422,7 +3422,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0061_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0061_alter_uniwebflexiblepage_content_and_more.py
index 861fa4a4..07fa6b92 100644
--- a/uniweb/migrations/0061_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0061_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -578,7 +578,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1304,7 +1304,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2009,7 +2009,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2714,7 +2714,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3419,7 +3419,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0068_alter_uniwebarticlepage_content_and_more.py b/uniweb/migrations/0068_alter_uniwebarticlepage_content_and_more.py
index f10d8bc8..6d79d7ca 100644
--- a/uniweb/migrations/0068_alter_uniwebarticlepage_content_and_more.py
+++ b/uniweb/migrations/0068_alter_uniwebarticlepage_content_and_more.py
@@ -9,7 +9,7 @@ import wagtail.images.blocks
import wagtailmetadata.models
from django.db import migrations, models
-import shared.blocks.base
+import shared.blocks
import shared.models.main
@@ -5433,7 +5433,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -6232,7 +6232,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -7010,7 +7010,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -7788,7 +7788,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -8566,7 +8566,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0069_alter_uniwebarticlepage_content_and_more.py b/uniweb/migrations/0069_alter_uniwebarticlepage_content_and_more.py
index a5eb9e5b..d33f0688 100644
--- a/uniweb/migrations/0069_alter_uniwebarticlepage_content_and_more.py
+++ b/uniweb/migrations/0069_alter_uniwebarticlepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -5543,7 +5543,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -6358,7 +6358,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -7136,7 +7136,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -7914,7 +7914,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -8692,7 +8692,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0071_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0071_alter_uniwebflexiblepage_content_and_more.py
index ca591cd0..d80225bf 100644
--- a/uniweb/migrations/0071_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0071_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -638,7 +638,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1514,7 +1514,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2353,7 +2353,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3192,7 +3192,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -4031,7 +4031,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0073_alter_uniwebflexiblepage_content_and_more.py b/uniweb/migrations/0073_alter_uniwebflexiblepage_content_and_more.py
index d99df63f..85917b87 100644
--- a/uniweb/migrations/0073_alter_uniwebflexiblepage_content_and_more.py
+++ b/uniweb/migrations/0073_alter_uniwebflexiblepage_content_and_more.py
@@ -7,7 +7,7 @@ import wagtail.fields
import wagtail.images.blocks
from django.db import migrations
-import shared.blocks.base
+import shared.blocks
class Migration(migrations.Migration):
@@ -638,7 +638,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -1438,7 +1438,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2201,7 +2201,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -2964,7 +2964,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
@@ -3727,7 +3727,7 @@ class Migration(migrations.Migration):
(
"projects",
wagtail.blocks.MultipleChoiceBlock(
- choices=shared.blocks.base.get_redmine_projects,
+ choices=shared.blocks.get_redmine_projects,
label="Projekty",
),
),
diff --git a/uniweb/migrations/0074_merge_20240702_0752.py b/uniweb/migrations/0074_merge_20240702_0752.py
new file mode 100644
index 00000000..9e307878
--- /dev/null
+++ b/uniweb/migrations/0074_merge_20240702_0752.py
@@ -0,0 +1,14 @@
+# Generated by Django 5.0.6 on 2024-07-02 05:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('uniweb', '0065_alter_uniwebarticlepage_content'),
+ ('uniweb', '0073_alter_uniwebflexiblepage_content_and_more'),
+ ]
+
+ operations = [
+ ]
--
GitLab