Skip to content
Snippets Groups Projects
Commit 2e96f97f authored by Ondrej Rehounek's avatar Ondrej Rehounek
Browse files

Fix formatting

parent 0222ec38
Branches
No related tags found
2 merge requests!418Release,!414district and region modules
Pipeline #6003 passed
Stage: build
Expand all Hide whitespace changes
Inline Side-by-side
.pre-commit-config.yaml
+ 1
− 1
View file @ 2e96f97f
default_language_version:
python: python3.7
python: python3.8
exclude: snapshots/
repos:
......
district/blocks.py
+ 3
− 1
View file @ 2e96f97f
......@@ -45,7 +45,9 @@ class ProgramItemBlock(StructBlock):
class ProgramBlock(StructBlock):
headline = CharBlock(label="Titulek bloku", required=True)
perex = TextBlock(label="Krátký text pod nadpisem", required=True)
person = PersonChooserBlock(label="Osoba", required=True) # TODO Page chooser block should suffice
person = PersonChooserBlock(
label="Osoba", required=True
) # TODO Page chooser block should suffice
completion_percentage = IntegerBlock(label="Procento dokončení", required=True)
program_items = ListBlock(ProgramItemBlock())
# program_items = TableBlock(label="Tabulka plnění programu", required=True)
......
district/migrations/0005_auto_20211108_2126.py
+ 244
− 60
View file @ 2e96f97f
# Generated by Django 3.2.8 on 2021-11-08 20:26
import district.blocks
from django.db import migrations, models
import django.db.models.deletion
import modelcluster.contrib.taggit
import modelcluster.fields
import shared.models
import wagtail.core.blocks
import wagtail.core.fields
import wagtail.images.blocks
import wagtailmetadata.models
from django.db import migrations, models
import district.blocks
import shared.models
class Migration(migrations.Migration):
dependencies = [
('wagtailimages', '0023_add_choose_permissions'),
('wagtailcore', '0062_comment_models_and_pagesubscription'),
('shared', '0001_initial'),
('taggit', '0003_taggeditem_add_unique_index'),
('district', '0004_auto_20210209_1222'),
("wagtailimages", "0023_add_choose_permissions"),
("wagtailcore", "0062_comment_models_and_pagesubscription"),
("shared", "0001_initial"),
("taggit", "0003_taggeditem_add_unique_index"),
("district", "0004_auto_20210209_1222"),
]
operations = [
migrations.AlterModelOptions(
name='districthomepage',
options={'verbose_name': 'Web místního sdružení'},
name="districthomepage",
options={"verbose_name": "Web místního sdružení"},
),
migrations.RemoveField(
model_name='districthomepage',
name='content',
model_name="districthomepage",
name="content",
),
migrations.AddField(
model_name='districtcontactpage',
name='text',
field=wagtail.core.fields.RichTextField(blank=True, verbose_name='Text'),
model_name="districtcontactpage",
name="text",
field=wagtail.core.fields.RichTextField(blank=True, verbose_name="Text"),
),
migrations.AddField(
model_name='districthomepage',
name='articles_title',
field=models.CharField(default='Děje se', max_length=256, verbose_name='Nadpis článků'),
model_name="districthomepage",
name="articles_title",
field=models.CharField(
default="Děje se", max_length=256, verbose_name="Nadpis článků"
),
preserve_default=False,
),
migrations.AddField(
model_name='districthomepage',
name='calendar_button_text',
field=models.CharField(default='Kalendář', max_length=256, verbose_name='Text tlačítka kalendáře'),
model_name="districthomepage",
name="calendar_button_text",
field=models.CharField(
default="Kalendář",
max_length=256,
verbose_name="Text tlačítka kalendáře",
),
),
migrations.AddField(
model_name='districthomepage',
name='calendar_embed_link',
field=models.URLField(default='', help_text="Mělo by začínat 'https://calendar.google.com/calendar/embed?...'", verbose_name='Odkaz na embed kalendář'),
model_name="districthomepage",
name="calendar_embed_link",
field=models.URLField(
default="",
help_text="Mělo by začínat 'https://calendar.google.com/calendar/embed?...'",
verbose_name="Odkaz na embed kalendář",
),
preserve_default=False,
),
migrations.AddField(
model_name='districthomepage',
name='region_map_button_text',
field=models.CharField(default='Piráti v krajích', max_length=256, verbose_name='Text tlačítka mapy'),
model_name="districthomepage",
name="region_map_button_text",
field=models.CharField(
default="Piráti v krajích",
max_length=256,
verbose_name="Text tlačítka mapy",
),
),
migrations.AddField(
model_name='districthomepage',
name='subheader',
field=wagtail.core.fields.StreamField([('header', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(label='Titulek', required=True)), ('subtitle', wagtail.core.blocks.CharBlock(label='Podtitulek', required=False)), ('image', wagtail.images.blocks.ImageChooserBlock())]))], blank=True, verbose_name='Blok pod headerem'),
model_name="districthomepage",
name="subheader",
field=wagtail.core.fields.StreamField(
[
(
"header",
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Titulek", required=True
),
),
(
"subtitle",
wagtail.core.blocks.CharBlock(
label="Podtitulek", required=False
),
),
("image", wagtail.images.blocks.ImageChooserBlock()),
]
),
)
],
blank=True,
verbose_name="Blok pod headerem",
),
),
migrations.AddField(
model_name='districthomepage',
name='twitter',
field=models.URLField(blank=True, null=True, verbose_name='Twitter URL'),
model_name="districthomepage",
name="twitter",
field=models.URLField(blank=True, null=True, verbose_name="Twitter URL"),
),
migrations.AddField(
model_name='districthomepage',
name='youtube',
field=models.URLField(blank=True, null=True, verbose_name='YouTube URL'),
model_name="districthomepage",
name="youtube",
field=models.URLField(blank=True, null=True, verbose_name="YouTube URL"),
),
migrations.AlterField(
model_name='districthomepage',
name='footperson_coord',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='district_footperson_coord', to='shared.person', verbose_name='Koordinátor'),
model_name="districthomepage",
name="footperson_coord",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name="district_footperson_coord",
to="shared.person",
verbose_name="Koordinátor",
),
),
migrations.AlterField(
model_name='districthomepage',
name='footperson_electman',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='district_footperson_electman', to='shared.person', verbose_name='Volební manažer'),
model_name="districthomepage",
name="footperson_electman",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name="district_footperson_electman",
to="shared.person",
verbose_name="Volební manažer",
),
),
migrations.AlterField(
model_name='districthomepage',
name='footperson_media',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='district_footperson_media', to='shared.person', verbose_name='Kontakt pro média'),
model_name="districthomepage",
name="footperson_media",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name="district_footperson_media",
to="shared.person",
verbose_name="Kontakt pro média",
),
),
migrations.CreateModel(
name='DistrictProgramPage',
name="DistrictProgramPage",
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')),
('perex', models.TextField(blank=True, verbose_name='Perex')),
('content', wagtail.core.fields.StreamField([('program_block', wagtail.core.blocks.StructBlock([('headline', wagtail.core.blocks.CharBlock(label='Titulek bloku', required=True)), ('perex', wagtail.core.blocks.TextBlock(label='Krátký text pod nadpisem', required=True)), ('person', district.blocks.PersonChooserBlock(label='Osoba', required=True)), ('completion_percentage', wagtail.core.blocks.IntegerBlock(label='Procento dokončení', required=True)), ('program_items', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.CharBlock(label='Název', required=True)), ('issue_link', wagtail.core.blocks.URLBlock(label='Odkaz na redmine', required=True)), ('completion_percentage', wagtail.core.blocks.IntegerBlock(label='Procento dokončení', required=True))])))]))], 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",
),
),
("perex", models.TextField(blank=True, verbose_name="Perex")),
(
"content",
wagtail.core.fields.StreamField(
[
(
"program_block",
wagtail.core.blocks.StructBlock(
[
(
"headline",
wagtail.core.blocks.CharBlock(
label="Titulek bloku", required=True
),
),
(
"perex",
wagtail.core.blocks.TextBlock(
label="Krátký text pod nadpisem",
required=True,
),
),
(
"person",
district.blocks.PersonChooserBlock(
label="Osoba", required=True
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení",
required=True,
),
),
(
"program_items",
wagtail.core.blocks.ListBlock(
wagtail.core.blocks.StructBlock(
[
(
"title",
wagtail.core.blocks.CharBlock(
label="Název",
required=True,
),
),
(
"issue_link",
wagtail.core.blocks.URLBlock(
label="Odkaz na redmine",
required=True,
),
),
(
"completion_percentage",
wagtail.core.blocks.IntegerBlock(
label="Procento dokončení",
required=True,
),
),
]
)
),
),
]
),
)
],
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': 'Program',
"verbose_name": "Program",
},
bases=(shared.models.SubpageMixin, wagtailmetadata.models.WagtailImageMetadataMixin, 'wagtailcore.page', models.Model),
bases=(
shared.models.SubpageMixin,
wagtailmetadata.models.WagtailImageMetadataMixin,
"wagtailcore.page",
models.Model,
),
),
migrations.CreateModel(
name='DistrictPersonTag',
name="DistrictPersonTag",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('content_object', modelcluster.fields.ParentalKey(on_delete=django.db.models.deletion.CASCADE, to='district.districtpersonpage')),
('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='district_districtpersontag_items', to='taggit.tag')),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"content_object",
modelcluster.fields.ParentalKey(
on_delete=django.db.models.deletion.CASCADE,
to="district.districtpersonpage",
),
),
(
"tag",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="district_districtpersontag_items",
to="taggit.tag",
),
),
],
options={
'abstract': False,
"abstract": False,
},
),
migrations.AddField(
model_name='districtpersonpage',
name='groups',
field=modelcluster.contrib.taggit.ClusterTaggableManager(blank=True, help_text='Skupina pro zařazení na stránce Lidé', through='district.DistrictPersonTag', to='taggit.Tag', verbose_name='Tags'),
model_name="districtpersonpage",
name="groups",
field=modelcluster.contrib.taggit.ClusterTaggableManager(
blank=True,
help_text="Skupina pro zařazení na stránce Lidé",
through="district.DistrictPersonTag",
to="taggit.Tag",
verbose_name="Tags",
),
),
]
district/models.py
+ 1
− 1
View file @ 2e96f97f
......@@ -6,7 +6,6 @@ from django.utils.translation import gettext_lazy
from modelcluster.contrib.taggit import ClusterTaggableManager
from modelcluster.fields import ParentalKey
from taggit.models import Tag, TaggedItemBase
from uniweb.constants import RICH_TEXT_FEATURES
from wagtail.admin.edit_handlers import (
CommentPanel,
FieldPanel,
......@@ -19,6 +18,7 @@ from wagtail.core.models import Page
from wagtailmetadata.models import MetadataPageMixin
from shared.models import ArticleMixin, Person, SubpageMixin
from uniweb.constants import RICH_TEXT_FEATURES
from .blocks import HomepageHeaderBlock, ProgramBlock
......
region/blocks.py
+ 1
− 5
View file @ 2e96f97f
from wagtail.core.blocks import (
CharBlock,
StructBlock,
URLBlock,
)
from wagtail.core.blocks import CharBlock, StructBlock, URLBlock
from wagtail.images.blocks import ImageChooserBlock
......
region/migrations/0001_initial.py
+ 414
− 70
View file @ 2e96f97f
This diff is collapsed.
region/models.py
+ 1
− 2
View file @ 2e96f97f
......@@ -6,7 +6,6 @@ from django.utils.translation import gettext_lazy
from modelcluster.contrib.taggit import ClusterTaggableManager
from modelcluster.fields import ParentalKey
from taggit.models import TaggedItemBase
from uniweb.constants import RICH_TEXT_FEATURES
from wagtail.admin.edit_handlers import (
CommentPanel,
FieldPanel,
......@@ -19,7 +18,7 @@ from wagtail.core.models import Page
from wagtailmetadata.models import MetadataPageMixin
from shared.models import ArticleMixin, Person, SubpageMixin
from uniweb.constants import RICH_TEXT_FEATURES
# TODO zatím prakticky shodné s district.models - až bude hotové, tak společné věci přenést do shared
......
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