Skip to content

Commit

Permalink
Merge branch 'main' into 10-collections
Browse files Browse the repository at this point in the history
  • Loading branch information
mrharpo authored Oct 30, 2023
2 parents a037025 + 134b752 commit 376f703
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
17 changes: 7 additions & 10 deletions exhibits/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,20 +85,17 @@ class ExhibitPage(Page):
]

content_panels = Page.content_panels + [
FieldPanel('body', classname='full'),
FieldPanel('cover_image', classname='full'),
FieldPanel('hero_image', classname='full'),
MultiFieldPanel([InlinePanel('authors', label='Author', heading='Author(s)')]),
MultiFieldPanel(
[
InlinePanel(
MultiFieldPanel([
FieldPanel('cover_image'),
FieldPanel('hero_image'),
], heading='Images'),
FieldPanel('body', classname='collapsed'),
InlinePanel('authors', heading='Author(s)'),
InlinePanel(
'other_exhibits',
label='Other Exhibits',
heading='Other Exhibits',
max_num=3,
)
]
),
]

api_fields = [
Expand Down
1 change: 1 addition & 0 deletions ov_wag/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
'wagtail.contrib.forms',
'wagtail.contrib.modeladmin',
'wagtail.contrib.redirects',
'wagtail.contrib.styleguide',
'wagtail.embeds',
'wagtail.sites',
'wagtail.users',
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Django >= 4.1.1, < 4.2
wagtail >= 4.0.2, < 4.1
wagtail >= 4.0.4, < 4.1
wagtail_factories >= 3.1.0, < 3.2
pydantic >= 1.10.2, < 2.0
psycopg2 >= 2.9.3, < 2.10

0 comments on commit 376f703

Please sign in to comment.