Skip to content
Snippets Groups Projects
Commit 89db3551 authored by OndraPetrzilka's avatar OndraPetrzilka
Browse files

Merge branch 'feature/pirati-cz' into feature/pirati-cz-ondra

parents 3fb0ea04 c2e2ac6a
No related branches found
No related tags found
3 merge requests!607Pirati.cz,!589Feature/pirati cz ondra,!575Feature/pirati cz
Show whitespace changes
Inline Side-by-side
main/migrations/0012_remove_mainpersonpage_facebook_and_more.py deleted 100644 → 0
+ 0
− 59
View file @ 3fb0ea04
# Generated by Django 4.0.7 on 2022-08-24 13:05
from django.db import migrations, models
import django.db.models.deletion
import wagtail.blocks
import wagtail.fields
class Migration(migrations.Migration):
dependencies = [
('wagtailimages', '0024_index_image_file_hash'),
('main', '0011_alter_mainarticlepage_content_and_more'),
]
operations = [
migrations.RemoveField(
model_name='mainpersonpage',
name='facebook',
),
migrations.RemoveField(
model_name='mainpersonpage',
name='instagram',
),
migrations.RemoveField(
model_name='mainpersonpage',
name='twitter',
),
migrations.AddField(
model_name='mainpersonpage',
name='main_image',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image', verbose_name='Hlavní obrázek'),
),
migrations.AddField(
model_name='mainpersonpage',
name='people',
field=wagtail.fields.StreamField([('people_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug skupiny', required=False)), ('person_list', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(label='Detail osoby', page_type=['main.MainPersonPage']), label='Skupina osob'))], label='Seznam osob'))], blank=True, use_json_field=None, verbose_name='Lidé'),
),
migrations.AddField(
model_name='mainpersonpage',
name='profile_image',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='+', to='wagtailimages.image', verbose_name='Profilový obrázek'),
),
migrations.AddField(
model_name='mainpersonpage',
name='social_links',
field=wagtail.fields.StreamField([('social_links', wagtail.blocks.StructBlock([('text', wagtail.blocks.CharBlock(label='Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)')), ('link', wagtail.blocks.URLBlock(label='Odkaz')), ('icon', wagtail.blocks.CharBlock(help_text='Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons', label='Ikona'))]))], blank=True, use_json_field=None, verbose_name='Odkazy na sociální sítě'),
),
migrations.AlterField(
model_name='mainhomepage',
name='social_links',
field=wagtail.fields.StreamField([('social_links', wagtail.blocks.StructBlock([('text', wagtail.blocks.CharBlock(label='Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)')), ('link', wagtail.blocks.URLBlock(label='Odkaz')), ('icon', wagtail.blocks.CharBlock(help_text='Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons', label='Ikona'))]))], blank=True, use_json_field=None, verbose_name='Odkazy na sociální sítě v zápatí webu'),
),
migrations.AlterField(
model_name='mainpeoplepage',
name='people',
field=wagtail.fields.StreamField([('people_group', wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(label='Titulek')), ('slug', wagtail.blocks.CharBlock(help_text='Není třeba vyplňovat, bude automaticky vyplněno', label='Slug skupiny', required=False)), ('person_list', wagtail.blocks.ListBlock(wagtail.blocks.PageChooserBlock(label='Detail osoby', page_type=['main.MainPersonPage']), label='Skupina osob'))], label='Seznam osob'))], blank=True, use_json_field=None, verbose_name='Lidé'),
),
]
main/migrations/0016_remove_mainpersonpage_facebook_and_more.py 0 → 100644
+ 155
− 0
View file @ 89db3551
# Generated by Django 4.0.7 on 2022-08-24 14:12
import django.db.models.deletion
import wagtail.blocks
import wagtail.fields
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("wagtailimages", "0024_index_image_file_hash"),
("main", "0015_mainarticlespage_last_import_log"),
]
operations = [
migrations.RemoveField(
model_name="mainpersonpage",
name="facebook",
),
migrations.RemoveField(
model_name="mainpersonpage",
name="instagram",
),
migrations.RemoveField(
model_name="mainpersonpage",
name="twitter",
),
migrations.AddField(
model_name="mainpersonpage",
name="main_image",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name="+",
to="wagtailimages.image",
verbose_name="Hlavní obrázek",
),
),
migrations.AddField(
model_name="mainpersonpage",
name="people",
field=wagtail.fields.StreamField(
[
(
"people_group",
wagtail.blocks.StructBlock(
[
("title", wagtail.blocks.CharBlock(label="Titulek")),
(
"slug",
wagtail.blocks.CharBlock(
help_text="Není třeba vyplňovat, bude automaticky vyplněno",
label="Slug skupiny",
required=False,
),
),
(
"person_list",
wagtail.blocks.ListBlock(
wagtail.blocks.PageChooserBlock(
label="Detail osoby",
page_type=["main.MainPersonPage"],
),
label="Skupina osob",
),
),
],
label="Seznam osob",
),
)
],
blank=True,
use_json_field=None,
verbose_name="Lidé",
),
),
migrations.AddField(
model_name="mainpersonpage",
name="profile_image",
field=models.ForeignKey(
blank=True,
null=True,
on_delete=django.db.models.deletion.PROTECT,
related_name="+",
to="wagtailimages.image",
verbose_name="Profilový obrázek",
),
),
migrations.AddField(
model_name="mainpersonpage",
name="social_links",
field=wagtail.fields.StreamField(
[
(
"social_links",
wagtail.blocks.StructBlock(
[
(
"text",
wagtail.blocks.CharBlock(
label="Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)"
),
),
("link", wagtail.blocks.URLBlock(label="Odkaz")),
(
"icon",
wagtail.blocks.CharBlock(
help_text="Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons",
label="Ikona",
),
),
]
),
)
],
blank=True,
use_json_field=None,
verbose_name="Odkazy na sociální sítě",
),
),
migrations.AlterField(
model_name="mainhomepage",
name="social_links",
field=wagtail.fields.StreamField(
[
(
"social_links",
wagtail.blocks.StructBlock(
[
(
"text",
wagtail.blocks.CharBlock(
label="Titulkek odkazu (text, který se zobrazí místo dlouhého odkazu)"
),
),
("link", wagtail.blocks.URLBlock(label="Odkaz")),
(
"icon",
wagtail.blocks.CharBlock(
help_text="Seznam ikon - https://styleguide.pirati.cz/latest/?p=viewall-atoms-icons",
label="Ikona",
),
),
]
),
)
],
blank=True,
use_json_field=None,
verbose_name="Odkazy na sociální sítě v zápatí webu",
),
),
]
main/migrations/0017_remove_mainarticlespage_timeline.py 0 → 100644
+ 17
− 0
View file @ 89db3551
# Generated by Django 4.0.7 on 2022-08-24 14:32
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("main", "0016_remove_mainpersonpage_facebook_and_more"),
]
operations = [
migrations.RemoveField(
model_name="mainarticlespage",
name="timeline",
),
]
main/models.py
+ 1
− 13
View file @ 89db3551
......@@ -195,18 +195,6 @@ class MainArticlesPage(
ExtendedMetadataPageMixin, SubpageMixin, MetadataPageMixin, Page
):
perex = models.TextField()
timeline = StreamField( # TODO delete
[
(
"article_list",
PageChooserBlock(
page_type="main.MainArticlePage", label="Vybrat aktualitu"
),
)
],
verbose_name="Timeline",
blank=True,
)
last_import_log = models.TextField(
"Výstup z posledního importu", null=True, blank=True
)
......@@ -238,7 +226,7 @@ class MainArticlesPage(
subpage_types = ["main.MainArticlePage"]
### PANELS
content_panels = Page.content_panels + [FieldPanel("perex"), FieldPanel("timeline")]
content_panels = Page.content_panels + [FieldPanel("perex")]
promote_panels = make_promote_panels()
### EDIT HANDLERS
......
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