Skip to content
Snippets Groups Projects
Commit e321c864 authored by jan.bednarik's avatar jan.bednarik
Browse files

Apply hooks

parent 88185d01
Branches
No related tags found
2 merge requests!145Upgrade,!143Hooks
Pipeline #1504 passed
Stage: build
Show whitespace changes
Inline Side-by-side
Showing
with 375 additions and 66 deletions
.isort.cfg
+ 1
− 1
View file @ e321c864
......@@ -2,6 +2,6 @@
# config compatible with Black
line_length = 88
multi_line_output = 3
default_sectiont = "THIRDPARTY"
default_section = "THIRDPARTY"
include_trailing_comma = true
known_third_party = arrow,django,environ,faker,ics,modelcluster,nbconvert,pirates,pytest,pytz,requests,sentry_sdk,snapshottest,taggit,traitlets,wagtail,wagtailmetadata
calendar_utils/migrations/0002_auto_20200523_0243.py
+ 3
− 1
View file @ e321c864
......@@ -11,6 +11,8 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterField(
model_name="calendar", name="url", field=models.URLField(),
model_name="calendar",
name="url",
field=models.URLField(),
),
]
districts/migrations/0001_initial.py
+ 3
− 1
View file @ e321c864
......@@ -49,7 +49,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Krajský rozcestník",},
options={
"verbose_name": "Krajský rozcestník",
},
bases=(
wagtailmetadata.models.MetadataMixin,
"wagtailcore.page",
......
donate/migrations/0001_initial.py
+ 15
− 5
View file @ e321c864
......@@ -31,7 +31,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Přehled projektů",},
options={
"verbose_name": "Přehled projektů",
},
bases=("wagtailcore.page",),
),
migrations.CreateModel(
......@@ -49,7 +51,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Přehled krajů",},
options={
"verbose_name": "Přehled krajů",
},
bases=("wagtailcore.page",),
),
migrations.CreateModel(
......@@ -78,7 +82,9 @@ class Migration(migrations.Migration):
),
("body", wagtail.core.fields.RichTextField(verbose_name="obsah")),
],
options={"verbose_name": "Kraj",},
options={
"verbose_name": "Kraj",
},
bases=("wagtailcore.page",),
),
migrations.CreateModel(
......@@ -128,7 +134,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Projekt",},
options={
"verbose_name": "Projekt",
},
bases=("wagtailcore.page",),
),
migrations.CreateModel(
......@@ -228,7 +236,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Dary",},
options={
"verbose_name": "Dary",
},
bases=("wagtailcore.page",),
),
]
donate/migrations/0003_donatecookiespage_donateinfopage.py
+ 6
− 2
View file @ e321c864
......@@ -47,7 +47,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Info",},
options={
"verbose_name": "Info",
},
bases=(
"wagtailcore.page",
donate.models.SubpageMixin,
......@@ -85,7 +87,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Cookies",},
options={
"verbose_name": "Cookies",
},
bases=(
"wagtailcore.page",
donate.models.SubpageMixin,
......
donate/migrations/0005_auto_20200715_1415.py
+ 7
− 2
View file @ e321c864
......@@ -18,7 +18,10 @@ class Migration(migrations.Migration):
]
operations = [
migrations.RemoveField(model_name="donateregionpage", name="perex",),
migrations.RemoveField(
model_name="donateregionpage",
name="perex",
),
migrations.CreateModel(
name="DonateTargetedDonationsPage",
fields=[
......@@ -80,7 +83,9 @@ class Migration(migrations.Migration):
),
),
],
options={"abstract": False,},
options={
"abstract": False,
},
bases=(
"wagtailcore.page",
donate.models.SubpageMixin,
......
donate/migrations/0007_auto_20200724_1658.py
+ 6
− 3
View file @ e321c864
......@@ -18,12 +18,15 @@ class Migration(migrations.Migration):
operations = [
migrations.RenameModel(
old_name="DonateCookiesPage", new_name="DonateTextPage",
old_name="DonateCookiesPage",
new_name="DonateTextPage",
),
migrations.AlterModelOptions(
name="donateinfopage", options={"verbose_name": "Infostránka s formulářem"},
name="donateinfopage",
options={"verbose_name": "Infostránka s formulářem"},
),
migrations.AlterModelOptions(
name="donatetextpage", options={"verbose_name": "Stránka s textem"},
name="donatetextpage",
options={"verbose_name": "Stránka s textem"},
),
]
donate/migrations/0012_auto_20200915_0114.py
+ 6
− 2
View file @ e321c864
......@@ -13,7 +13,8 @@ class Migration(migrations.Migration):
operations = [
migrations.RemoveField(
model_name="donatetargeteddonationspage", name="targeted_donations",
model_name="donatetargeteddonationspage",
name="targeted_donations",
),
migrations.CreateModel(
name="TargetedDonation",
......@@ -63,6 +64,9 @@ class Migration(migrations.Migration):
),
),
],
options={"ordering": ["sort_order"], "abstract": False,},
options={
"ordering": ["sort_order"],
"abstract": False,
},
),
]
donate/models.py
+ 6
− 3
View file @ e321c864
......@@ -119,13 +119,16 @@ class DonateHomePage(DonateFormMixin, Page, MetadataPageMixin):
"hlavní sekce",
),
MultiFieldPanel(
[FieldPanel("support_title"), FieldPanel("support_body")], "podpoř stranu",
[FieldPanel("support_title"), FieldPanel("support_body")],
"podpoř stranu",
),
MultiFieldPanel(
[FieldPanel("project_title"), FieldPanel("project_body")], "podpoř projekt",
[FieldPanel("project_title"), FieldPanel("project_body")],
"podpoř projekt",
),
MultiFieldPanel(
[FieldPanel("region_title"), FieldPanel("region_body")], "podpoř kraj",
[FieldPanel("region_title"), FieldPanel("region_body")],
"podpoř kraj",
),
]
......
home/migrations/0001_initial.py
+ 3
− 1
View file @ e321c864
......@@ -30,7 +30,9 @@ class Migration(migrations.Migration):
),
("body", wagtail.core.fields.RichTextField(verbose_name="obsah")),
],
options={"verbose_name": "Maják homepage",},
options={
"verbose_name": "Maják homepage",
},
bases=("wagtailcore.page",),
),
]
home/migrations/0002_homeunderconstructionpage.py
+ 3
− 1
View file @ e321c864
......@@ -27,7 +27,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Web se připravuje",},
options={
"verbose_name": "Web se připravuje",
},
bases=("wagtailcore.page",),
),
]
majak/settings/base.py
+ 3
− 1
View file @ e321c864
......@@ -189,7 +189,9 @@ CACHES["renditions"]["TIMEOUT"] = 60 * 60 * 24
SENTRY_DSN = env.str("SENTRY_DSN", default="")
if SENTRY_DSN:
sentry_sdk.init(
dsn=SENTRY_DSN, integrations=[DjangoIntegration()], send_default_pii=True,
dsn=SENTRY_DSN,
integrations=[DjangoIntegration()],
send_default_pii=True,
)
# WAGTAIL SETTINGS
......
program2021/migrations/0001_initial.py
+ 9
− 3
View file @ e321c864
......@@ -36,7 +36,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Program 2021",},
options={
"verbose_name": "Program 2021",
},
bases=("wagtailcore.page",),
),
migrations.CreateModel(
......@@ -259,7 +261,9 @@ class Migration(migrations.Migration):
),
),
],
options={"verbose_name": "Programový bod",},
options={
"verbose_name": "Programový bod",
},
bases=(
"wagtailcore.page",
wagtailmetadata.models.MetadataMixin,
......@@ -294,7 +298,9 @@ class Migration(migrations.Migration):
),
),
],
options={"abstract": False,},
options={
"abstract": False,
},
),
migrations.AddField(
model_name="program2021pointpage",
......
program2021/migrations/0003_auto_20200805_1034.py
+ 3
− 1
View file @ e321c864
......@@ -42,7 +42,9 @@ class Migration(migrations.Migration):
),
),
],
options={"abstract": False,},
options={
"abstract": False,
},
),
migrations.AddField(
model_name="program2021pointpage",
......
program2021/migrations/0008_auto_20200812_2117.py
+ 7
− 2
View file @ e321c864
......@@ -10,6 +10,11 @@ class Migration(migrations.Migration):
]
operations = [
migrations.RemoveField(model_name="program2021pointpage", name="search_tags",),
migrations.DeleteModel(name="Program2021PointPageSearchTag",),
migrations.RemoveField(
model_name="program2021pointpage",
name="search_tags",
),
migrations.DeleteModel(
name="Program2021PointPageSearchTag",
),
]
program2021/models.py
+ 11
− 3
View file @ e321c864
......@@ -63,14 +63,21 @@ class Program2021HomePage(Page):
help_text="Hlavní titulek domovské stránky",
)
perex = models.TextField(
"perex", max_length=512, blank=True, null=True, help_text="Text pod titulkem",
"perex",
max_length=512,
blank=True,
null=True,
help_text="Text pod titulkem",
)
### PANELS
content_panels = Page.content_panels + [
MultiFieldPanel(
[FieldPanel("headline"), FieldPanel("perex"),],
[
FieldPanel("headline"),
FieldPanel("perex"),
],
heading="Vyhledávací formulář",
),
]
......@@ -278,7 +285,8 @@ class Program2021PointPage(Page, MetadataPageMixin):
heading="základní informace",
),
MultiFieldPanel(
[FieldPanel("owner_name"), FieldPanel("owner_url")], heading="garant",
[FieldPanel("owner_name"), FieldPanel("owner_url")],
heading="garant",
),
StreamFieldPanel("images"),
StreamFieldPanel("related"),
......
regulace_konopi/apps.py
+ 1
− 1
View file @ e321c864
......@@ -2,4 +2,4 @@ from django.apps import AppConfig
class RegulaceKonopiConfig(AppConfig):
name = 'regulace_konopi'
name = "regulace_konopi"
regulace_konopi/migrations/0001_initial.py
+ 264
− 18
View file @ e321c864
# Generated by Django 3.1.1 on 2020-10-28 12:50
from django.db import migrations, models
import django.db.models.deletion
import uniweb.models
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
import wagtailmetadata.models
from django.db import migrations, models
import uniweb.models
class Migration(migrations.Migration):
......@@ -14,35 +15,280 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
('wagtailcore', '0052_pagelogentry'),
('wagtailimages', '0022_uploadedimage'),
("wagtailcore", "0052_pagelogentry"),
("wagtailimages", "0022_uploadedimage"),
]
operations = [
migrations.CreateModel(
name='RegkonSubPage',
name="RegkonSubPage",
fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
('content', wagtail.core.fields.StreamField([('title', wagtail.core.blocks.CharBlock(icon='title', label='nadpis')), ('text', wagtail.core.blocks.RichTextBlock(features=['h2', 'h3', 'h4', 'h5', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'superscript', 'subscript', 'strikethrough', 'blockquote'], label='text')), ('carousel', wagtail.core.blocks.ListBlock(wagtail.images.blocks.ImageChooserBlock(label='obrázek'), icon='image', label='carousel')), ('FAQ', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('question', wagtail.core.blocks.TextBlock()), ('answer', wagtail.core.blocks.RichTextBlock())], template='regulace_konopi/blocks/faq.html'), label='faq')), ('meps', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock(label='název')), ('mep', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock(label='jméno')), ('approved', wagtail.core.blocks.ChoiceBlock(choices=[(1, 'schváleno'), (0, 'odmítá'), (-1, 'nevyjádřil se')], label='hlasoval'))])))], template='regulace_konopi/blocks/party.html'))], blank=True, verbose_name='obsah stránky')),
('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Search image')),
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
(
"content",
wagtail.core.fields.StreamField(
[
(
"title",
wagtail.core.blocks.CharBlock(
icon="title", label="nadpis"
),
),
(
"text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"superscript",
"subscript",
"strikethrough",
"blockquote",
],
label="text",
),
),
(
"carousel",
wagtail.core.blocks.ListBlock(
wagtail.images.blocks.ImageChooserBlock(
label="obrázek"
),
icon="image",
label="carousel",
),
),
(
"FAQ",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"question",
wagtail.core.blocks.TextBlock(),
),
(
"answer",
wagtail.core.blocks.RichTextBlock(),
),
],
template="regulace_konopi/blocks/faq.html",
),
label="faq",
),
),
(
"meps",
wagtail.core.blocks.StructBlock(
[
(
"name",
wagtail.core.blocks.CharBlock(
label="název"
),
),
(
"mep",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"name",
wagtail.core.blocks.CharBlock(
label="jméno"
),
),
(
"approved",
wagtail.core.blocks.ChoiceBlock(
choices=[
(1, "schváleno"),
(0, "odmítá"),
(
-1,
"nevyjádřil se",
),
],
label="hlasoval",
),
),
]
)
),
),
],
template="regulace_konopi/blocks/party.html",
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
(
"search_image",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailimages.image",
verbose_name="Search image",
),
),
],
options={
'verbose_name': 'Podstránka',
"verbose_name": "Podstránka",
},
bases=('wagtailcore.page', uniweb.models.SubpageMixin, wagtailmetadata.models.MetadataMixin, models.Model),
bases=(
"wagtailcore.page",
uniweb.models.SubpageMixin,
wagtailmetadata.models.MetadataMixin,
models.Model,
),
),
migrations.CreateModel(
name='RegkonHomePage',
name="RegkonHomePage",
fields=[
('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
('content', wagtail.core.fields.StreamField([('title', wagtail.core.blocks.CharBlock(icon='title', label='nadpis')), ('text', wagtail.core.blocks.RichTextBlock(features=['h2', 'h3', 'h4', 'h5', 'bold', 'italic', 'ol', 'ul', 'hr', 'link', 'document-link', 'image', 'superscript', 'subscript', 'strikethrough', 'blockquote'], label='text')), ('carousel', wagtail.core.blocks.ListBlock(wagtail.images.blocks.ImageChooserBlock(label='obrázek'), icon='image', label='carousel'))], blank=True, verbose_name='obsah stránky')),
('matomo_id', models.IntegerField(blank=True, null=True, verbose_name='Matomo ID pro sledování návštěvnosti')),
('top_menu', wagtail.core.fields.StreamField([('item', wagtail.core.blocks.StructBlock([('name', wagtail.core.blocks.CharBlock(label='název')), ('page', wagtail.core.blocks.PageChooserBlock(label='stránka', page_type=['regulace_konopi.RegkonHomePage', 'regulace_konopi.RegkonSubPage']))]))], blank=True, verbose_name='horní menu')),
('search_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.image', verbose_name='Search image')),
(
"page_ptr",
models.OneToOneField(
auto_created=True,
on_delete=django.db.models.deletion.CASCADE,
parent_link=True,
primary_key=True,
serialize=False,
to="wagtailcore.page",
),
),
(
"content",
wagtail.core.fields.StreamField(
[
(
"title",
wagtail.core.blocks.CharBlock(
icon="title", label="nadpis"
),
),
(
"text",
wagtail.core.blocks.RichTextBlock(
features=[
"h2",
"h3",
"h4",
"h5",
"bold",
"italic",
"ol",
"ul",
"hr",
"link",
"document-link",
"image",
"superscript",
"subscript",
"strikethrough",
"blockquote",
],
label="text",
),
),
(
"carousel",
wagtail.core.blocks.ListBlock(
wagtail.images.blocks.ImageChooserBlock(
label="obrázek"
),
icon="image",
label="carousel",
),
),
],
blank=True,
verbose_name="obsah stránky",
),
),
(
"matomo_id",
models.IntegerField(
blank=True,
null=True,
verbose_name="Matomo ID pro sledování návštěvnosti",
),
),
(
"top_menu",
wagtail.core.fields.StreamField(
[
(
"item",
wagtail.core.blocks.StructBlock(
[
(
"name",
wagtail.core.blocks.CharBlock(
label="název"
),
),
(
"page",
wagtail.core.blocks.PageChooserBlock(
label="stránka",
page_type=[
"regulace_konopi.RegkonHomePage",
"regulace_konopi.RegkonSubPage",
],
),
),
]
),
)
],
blank=True,
verbose_name="horní menu",
),
),
(
"search_image",
models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="+",
to="wagtailimages.image",
verbose_name="Search image",
),
),
],
options={
'verbose_name': 'Regulace konpí',
"verbose_name": "Regulace konpí",
},
bases=(wagtailmetadata.models.MetadataMixin, 'wagtailcore.page', models.Model),
bases=(
wagtailmetadata.models.MetadataMixin,
"wagtailcore.page",
models.Model,
),
),
]
regulace_konopi/models.py
+ 17
− 14
View file @ e321c864
from django.db import models
# Create your models here.
from django.utils.translation import gettext_lazy
from wagtail.admin import blocks
from wagtail.admin.edit_handlers import StreamFieldPanel, MultiFieldPanel, FieldPanel, HelpPanel
from wagtail.admin.edit_handlers import (
FieldPanel,
HelpPanel,
MultiFieldPanel,
StreamFieldPanel,
)
from wagtail.core.fields import StreamField
from wagtail.core.models import Page
from wagtail.images.blocks import ImageChooserBlock
......@@ -12,11 +15,7 @@ from wagtailmetadata.models import MetadataPageMixin
from tuning import help
SUPPORT_CHOICES = (
(1, 'Pro'),
(0, 'Proti'),
(-1, 'Zdržel se')
)
SUPPORT_CHOICES = ((1, "Pro"), (0, "Proti"), (-1, "Zdržel se"))
RICH_TEXT_FEATURES = [
"h2",
......@@ -91,7 +90,9 @@ class RegkonHomePage(MetadataPageMixin, Page):
"Matomo ID pro sledování návštěvnosti", blank=True, null=True
)
top_menu = StreamField(
[("item", MenuItemBlock())], verbose_name="horní menu", blank=True,
[("item", MenuItemBlock())],
verbose_name="horní menu",
blank=True,
)
### PANELS
......@@ -146,11 +147,13 @@ class RegkonSubPage(Page, MetadataPageMixin):
ImageChooserBlock(label="obrázek"), label="carousel", icon="image"
),
),
("FAQ",
(
"FAQ",
blocks.ListBlock(
FaqBlock(template='regulace_konopi/blocks/faq.html'), label="faq")
FaqBlock(template="regulace_konopi/blocks/faq.html"), label="faq"
),
),
("meps", PartyBlock(template='regulace_konopi/blocks/party.html'))
("meps", PartyBlock(template="regulace_konopi/blocks/party.html")),
],
verbose_name="obsah stránky",
blank=True,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Pirátský GitLab - Home of the CopyLeft