Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DSRC-110: FeaturedPageBlock functionality #1727

Merged
merged 13 commits into from
Oct 15, 2024
Merged

DSRC-110: FeaturedPageBlock functionality #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b556135
Override type label with different labels based on page model
jamesbiggs Oct 14, 2024
f7f0eb1
Formatting
jamesbiggs Oct 14, 2024
ef6b322
Teaser text override
jamesbiggs Oct 14, 2024
6ba17ab
Migrations
jamesbiggs Oct 14, 2024
ab534cd
Updated `verbose_name_public` on relevant models
jamesbiggs Oct 15, 2024
0cc8333
Merge branch 'develop' into fix/DSRC-110-missed-functionality
jamesbiggs Oct 15, 2024
0f5d80a
Updated blog verbose names (added max_count 1 to blog index page)
jamesbiggs Oct 15, 2024
cf47286
Formatting
jamesbiggs Oct 15, 2024
d7c0606
Updated type_label logic
jamesbiggs Oct 15, 2024
4b48077
Removed verbose_name_public = None (redundant)
jamesbiggs Oct 15, 2024
9f7195e
Formatting and updated test fixtures
jamesbiggs Oct 15, 2024
aa0fe4e
Remove redundant verbose_names
jamesbiggs Oct 15, 2024
5f1daf6
Migrations
jamesbiggs Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions etna/api/tests/expected_results/article.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
"title": "arts",
"url": "/arts/",
"full_url": "http://localhost/arts/",
"type_label": "Topic",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 2,
Expand All @@ -361,7 +361,7 @@
"title": "early_modern",
"url": "/early_modern/",
"full_url": "http://localhost/early_modern/",
"type_label": "Time period",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 4,
Expand All @@ -385,7 +385,7 @@
"title": "postwar",
"url": "/postwar/",
"full_url": "http://localhost/postwar/",
"type_label": "Time period",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 6,
Expand Down
2 changes: 1 addition & 1 deletion etna/api/tests/expected_results/article_index.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"title": "article_index",
"global_alert": null,
"type_label": "Article index",
"type_label": null,
"mourning_notice": {
"title": "Test title",
"message": "<p>Test message</p>"
Expand Down
2 changes: 1 addition & 1 deletion etna/api/tests/expected_results/arts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"custom_sensitive_image": null
},
"global_alert": null,
"type_label": "Topic",
"type_label": "Explore the collection",
"mourning_notice": {
"title": "Test title",
"message": "<p>Test message</p>"
Expand Down
2 changes: 1 addition & 1 deletion etna/api/tests/expected_results/author.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"cascade": true,
"uid": ALERT_UID
},
"type_label": "Person",
"type_label": null,
"mourning_notice": {
"title": "Test title",
"message": "<p>Test message</p>"
Expand Down
2 changes: 1 addition & 1 deletion etna/api/tests/expected_results/early_modern.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"custom_sensitive_image": null
},
"global_alert": null,
"type_label": "Time period",
"type_label": "Explore the collection",
"mourning_notice": {
"title": "Test title",
"message": "<p>Test message</p>"
Expand Down
6 changes: 3 additions & 3 deletions etna/api/tests/expected_results/focused_article.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"title": "arts",
"url": "/arts/",
"full_url": "http://localhost/arts/",
"type_label": "Topic",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 2,
Expand All @@ -179,7 +179,7 @@
"title": "early_modern",
"url": "/early_modern/",
"full_url": "http://localhost/early_modern/",
"type_label": "Time period",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 4,
Expand All @@ -205,7 +205,7 @@
"title": "author",
"url": "/people/author/",
"full_url": "http://localhost/people/author/",
"type_label": "Person",
"type_label": null,
"teaser_text": "Teaser text",
"teaser_image": {
"id": 10,
Expand Down
4 changes: 2 additions & 2 deletions etna/api/tests/expected_results/highlight_gallery.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
"title": "arts",
"url": "/arts/",
"full_url": "http://localhost/arts/",
"type_label": "Topic",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 2,
Expand All @@ -183,7 +183,7 @@
"title": "early_modern",
"url": "/early_modern/",
"full_url": "http://localhost/early_modern/",
"type_label": "Time period",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 4,
Expand Down
14 changes: 7 additions & 7 deletions etna/api/tests/expected_results/pages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"title": "Home",
"url": "/",
"full_url": "http://localhost/",
"type_label": "Home",
"type_label": null,
"teaser_text": "",
"teaser_image": null
},
Expand All @@ -17,7 +17,7 @@
"title": "arts",
"url": "/arts/",
"full_url": "http://localhost/arts/",
"type_label": "Topic",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 2,
Expand Down Expand Up @@ -66,7 +66,7 @@
"title": "early_modern",
"url": "/early_modern/",
"full_url": "http://localhost/early_modern/",
"type_label": "Time period",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 4,
Expand All @@ -90,7 +90,7 @@
"title": "postwar",
"url": "/postwar/",
"full_url": "http://localhost/postwar/",
"type_label": "Time period",
"type_label": "Explore the collection",
"teaser_text": "Teaser text",
"teaser_image": {
"id": 6,
Expand All @@ -114,7 +114,7 @@
"title": "people",
"url": "/people/",
"full_url": "http://localhost/people/",
"type_label": "People index",
"type_label": null,
"teaser_text": "Teaser text",
"teaser_image": {
"id": 8,
Expand All @@ -138,7 +138,7 @@
"title": "author",
"url": "/people/author/",
"full_url": "http://localhost/people/author/",
"type_label": "Person",
"type_label": null,
"teaser_text": "Teaser text",
"teaser_image": {
"id": 10,
Expand Down Expand Up @@ -203,7 +203,7 @@
"title": "article_index",
"url": "/article_index/",
"full_url": "http://localhost/article_index/",
"type_label": "Article index",
"type_label": null,
"teaser_text": "Teaser text",
"teaser_image": {
"id": 11,
Expand Down
4 changes: 2 additions & 2 deletions etna/api/tests/expected_results/people.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"cascade": true,
"uid": ALERT_UID
},
"type_label": "People index",
"type_label": null,
"mourning_notice": {
"title": "Test title",
"message": "<p>Test message</p>"
Expand All @@ -79,7 +79,7 @@
"title": "author",
"url": "/people/author/",
"full_url": "http://localhost/people/author/",
"type_label": "Person",
"type_label": null,
"teaser_text": "Teaser text",
"teaser_image": {
"id": 10,
Expand Down
2 changes: 1 addition & 1 deletion etna/api/tests/expected_results/postwar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"custom_sensitive_image": null
},
"global_alert": null,
"type_label": "Time period",
"type_label": "Explore the collection",
"mourning_notice": {
"title": "Test title",
"message": "<p>Test message</p>"
Expand Down
Loading
Loading