Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Maják
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TO
Maják
Commits
3ff8ebf7
Commit
3ff8ebf7
authored
2 years ago
by
OndraPetrzilka
Browse files
Options
Downloads
Patches
Plain Diff
changed text field on program page perex to rich text field
parent
e124e6fb
No related branches found
No related tags found
2 merge requests
!617
Release
,
!616
Feature/main misc enhancements 2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
main/migrations/0031_alter_mainprogrampage_perex.py
+19
-0
19 additions, 0 deletions
main/migrations/0031_alter_mainprogrampage_perex.py
main/models.py
+1
-1
1 addition, 1 deletion
main/models.py
main/templates/main/main_program_page.html
+3
-3
3 additions, 3 deletions
main/templates/main/main_program_page.html
with
23 additions
and
4 deletions
main/migrations/0031_alter_mainprogrampage_perex.py
0 → 100644
+
19
−
0
View file @
3ff8ebf7
# Generated by Django 4.0.7 on 2022-09-06 11:42
from
django.db
import
migrations
import
wagtail.fields
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
main
'
,
'
0030_mainarticlepage_is_black
'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'
mainprogrampage
'
,
name
=
'
perex
'
,
field
=
wagtail
.
fields
.
RichTextField
(),
),
]
This diff is collapsed.
Click to expand it.
main/models.py
+
1
−
1
View file @
3ff8ebf7
...
@@ -520,7 +520,7 @@ class MainArticlePage(
...
@@ -520,7 +520,7 @@ class MainArticlePage(
class
MainProgramPage
(
ExtendedMetadataPageMixin
,
SubpageMixin
,
MetadataPageMixin
,
Page
):
class
MainProgramPage
(
ExtendedMetadataPageMixin
,
SubpageMixin
,
MetadataPageMixin
,
Page
):
### FIELDS
### FIELDS
perex
=
models
.
TextField
()
perex
=
Rich
TextField
()
program
=
StreamField
(
program
=
StreamField
(
[(
"
program_group
"
,
blocks
.
ProgramGroupBlock
(
label
=
"
Část programu
"
))],
[(
"
program_group
"
,
blocks
.
ProgramGroupBlock
(
label
=
"
Část programu
"
))],
verbose_name
=
"
Program
"
,
verbose_name
=
"
Program
"
,
...
...
This diff is collapsed.
Click to expand it.
main/templates/main/main_program_page.html
+
3
−
3
View file @
3ff8ebf7
...
@@ -7,9 +7,9 @@
...
@@ -7,9 +7,9 @@
<main
role=
"main"
class=
"mb-4 xl:mb-20"
>
<main
role=
"main"
class=
"mb-4 xl:mb-20"
>
<div
class=
"grid-container"
>
<div
class=
"grid-container"
>
<div
class=
"grid-content"
>
<div
class=
"grid-content"
>
<
p
class=
"font-alt text-xl leading-7 mb-5"
>
<
div
class=
"font-alt text-xl leading-7 mb-5"
>
{{ page.perex }}
{{ page.perex
|richtext
}}
</
p
>
</
div
>
</div>
</div>
</div>
</div>
<div
class=
""
>
<div
class=
""
>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment