Skip to content

Commit b2e962c

Browse files
committed
Merge branch 'feature/early_inclusion_dialogue' into develop
2 parents 31dea62 + 53a2251 commit b2e962c

File tree

43 files changed

+32524
-8462
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+32524
-8462
lines changed

.github/workflows/composer.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ jobs:
6363
runs-on: ubuntu-latest
6464
strategy:
6565
fail-fast: false
66+
# Ignore abandoned packages until https://www.drupal.org/project/drupal/issues/3550917
6667
steps:
6768
- uses: actions/checkout@v4
6869
- run: |
6970
docker network create frontend
7071
- run: |
71-
docker compose run --rm phpfpm composer audit --locked
72+
docker compose run --rm phpfpm composer audit --locked --abandoned=ignore

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ Versioning](https://semver.org/spec/v2.0.0.html).
1212
* Deny access for admin comments tab in general
1313
* Update user permissions
1414
* Add access restrictions on unpublished comments
15+
* Override default dialogue form
16+
* Add promoted content feature
17+
* Updated Drupal core 10.5.2 => 10.5.6
1518

1619
* [PR-555](https://github.com/itk-dev/deltag.aarhus.dk/pull/555)
1720
* Add underline to active navigation.

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,8 @@
300300
"Add option to hide exposed sort field labels (based on “Add option to hide exposed filter field labels”)": "patches/drupal/better_exposed_filters/visually-hidden-label-on-sort.patch"
301301
},
302302
"drupal/core": {
303-
"Text format wrapper does not take description_display into account (https://www.drupal.org/project/drupal/issues/2421445#comment-14328645)": "https://www.drupal.org/files/issues/2021-12-03/2421445-18_0.patch"
303+
"Text format wrapper does not take description_display into account (https://www.drupal.org/project/drupal/issues/2421445#comment-14328645)": "https://www.drupal.org/files/issues/2021-12-03/2421445-18_0.patch",
304+
"Fix validation bug https://www.drupal.org/project/drupal/issues/3210319": "https://www.drupal.org/files/issues/2021-04-23/validate-reference-constraint-3210319-3.patch"
304305
},
305306
"drupal/site_status_message": {
306307
"Add cache support (https://www.drupal.org/project/site_status_message/issues/3497218)": "https://git.drupalcode.org/project/site_status_message/-/merge_requests/8.diff"

composer.lock

Lines changed: 571 additions & 526 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/sync/core.entity_form_display.node.dialogue.default.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,14 @@ content:
9797
settings: { }
9898
third_party_settings: { }
9999
field_dialogue_proposal_category:
100-
type: options_buttons
100+
type: entity_reference_autocomplete
101101
weight: 29
102102
region: content
103-
settings: { }
103+
settings:
104+
match_operator: CONTAINS
105+
match_limit: 10
106+
size: 60
107+
placeholder: ''
104108
third_party_settings: { }
105109
field_dialogue_proposal_config:
106110
type: options_buttons
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
uuid: bbfd582d-56e2-4f35-95ec-7a50b5cbf301
2+
langcode: da
3+
status: true
4+
dependencies:
5+
config:
6+
- field.field.paragraph.aktuelt_i_projektet.field_promoted_content
7+
- paragraphs.paragraphs_type.aktuelt_i_projektet
8+
id: paragraph.aktuelt_i_projektet.default
9+
targetEntityType: paragraph
10+
bundle: aktuelt_i_projektet
11+
mode: default
12+
content:
13+
field_promoted_content:
14+
type: entity_reference_autocomplete
15+
weight: 0
16+
region: content
17+
settings:
18+
match_operator: CONTAINS
19+
match_limit: 10
20+
size: 60
21+
placeholder: ''
22+
third_party_settings: { }
23+
hidden:
24+
created: true
25+
status: true
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
uuid: 95a74d8a-3742-40cd-8624-d8d6e55ffca8
2+
langcode: da
3+
status: true
4+
dependencies:
5+
config:
6+
- core.entity_view_mode.node.content_promoted
7+
- field.field.node.dialogue.field_area
8+
- field.field.node.dialogue.field_content_sections
9+
- field.field.node.dialogue.field_department
10+
- field.field.node.dialogue.field_dialogue_proposal_category
11+
- field.field.node.dialogue.field_dialogue_proposal_config
12+
- field.field.node.dialogue.field_dialogue_proposal_location
13+
- field.field.node.dialogue.field_dialogue_proposal_zoom
14+
- field.field.node.dialogue.field_teaser
15+
- field.field.node.dialogue.field_top_images
16+
- field.field.node.dialogue.field_type
17+
- node.type.dialogue
18+
module:
19+
- entity_reference_revisions
20+
- user
21+
id: node.dialogue.content_promoted
22+
targetEntityType: node
23+
bundle: dialogue
24+
mode: content_promoted
25+
content:
26+
field_area:
27+
type: entity_reference_label
28+
label: hidden
29+
settings:
30+
link: false
31+
third_party_settings: { }
32+
weight: 3
33+
region: content
34+
field_content_sections:
35+
type: entity_reference_revisions_entity_view
36+
label: hidden
37+
settings:
38+
view_mode: default
39+
link: ''
40+
third_party_settings: { }
41+
weight: 5
42+
region: content
43+
field_department:
44+
type: entity_reference_label
45+
label: hidden
46+
settings:
47+
link: false
48+
third_party_settings: { }
49+
weight: 2
50+
region: content
51+
field_teaser:
52+
type: basic_string
53+
label: hidden
54+
settings: { }
55+
third_party_settings: { }
56+
weight: 1
57+
region: content
58+
field_top_images:
59+
type: entity_reference_entity_view
60+
label: hidden
61+
settings:
62+
view_mode: full
63+
link: false
64+
third_party_settings: { }
65+
weight: 0
66+
region: content
67+
field_type:
68+
type: entity_reference_label
69+
label: hidden
70+
settings:
71+
link: false
72+
third_party_settings: { }
73+
weight: 4
74+
region: content
75+
hidden:
76+
field_dialogue_proposal_category: true
77+
field_dialogue_proposal_config: true
78+
field_dialogue_proposal_location: true
79+
field_dialogue_proposal_zoom: true
80+
langcode: true
81+
links: true
82+
published_at: true
83+
search_api_excerpt: true
84+
sharing_buttons: true
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
uuid: b8bc4240-1cc1-48c7-bd5d-3306170a0459
2+
langcode: da
3+
status: true
4+
dependencies:
5+
config:
6+
- field.field.paragraph.aktuelt_i_projektet.field_promoted_content
7+
- paragraphs.paragraphs_type.aktuelt_i_projektet
8+
id: paragraph.aktuelt_i_projektet.default
9+
targetEntityType: paragraph
10+
bundle: aktuelt_i_projektet
11+
mode: default
12+
content:
13+
field_promoted_content:
14+
type: entity_reference_entity_view
15+
label: hidden
16+
settings:
17+
view_mode: content_promoted
18+
link: false
19+
third_party_settings: { }
20+
weight: 0
21+
region: content
22+
hidden:
23+
search_api_excerpt: true
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
uuid: a4068ae9-cfe2-4489-8713-ac15abb6a8ab
2+
langcode: da
3+
status: true
4+
dependencies:
5+
module:
6+
- node
7+
id: node.content_promoted
8+
label: 'Content promoted'
9+
description: ''
10+
targetEntityType: node
11+
cache: true

config/sync/field.field.node.dialogue.field_dialogue_proposal_category.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ settings:
2424
sort:
2525
field: name
2626
direction: asc
27-
auto_create: false
27+
auto_create: true
2828
auto_create_bundle: ''
2929
field_type: entity_reference

0 commit comments

Comments
 (0)