Skip to content

Commit ba57449

Browse files
committed
Merge branch 'main' into develop
# Conflicts: # .github/workflows/pr.yaml # CHANGELOG.md
2 parents a494671 + 0433e9a commit ba57449

16 files changed

+666
-179
lines changed

.github/workflows/pr.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@ jobs:
5252
steps:
5353
- uses: actions/checkout@v4
5454
- uses: arduino/setup-task@v2
55-
# https://github.com/arduino/setup-task/tree/main?tab=readme-ov-file#repo-token
55+
# https://github.com/arduino/setup-task/tree/56d0cc033e3cecc5f07a291fdd39f29388d21800?tab=readme-ov-file#repo-token
5656
with:
5757
repo-token: ${{ secrets.GITHUB_TOKEN }}
58+
5859
- run: |
5960
docker network create frontend
6061
task compose -- up --detach
@@ -75,6 +76,7 @@ jobs:
7576
- uses: arduino/setup-task@v2
7677
with:
7778
repo-token: ${{ secrets.GITHUB_TOKEN }}
79+
7880
- run: task coding-standards:assets:check
7981
# Check for any changes (task …:check runs task …:apply)
8082
- run: git diff --exit-code
@@ -87,6 +89,7 @@ jobs:
8789
- uses: arduino/setup-task@v2
8890
with:
8991
repo-token: ${{ secrets.GITHUB_TOKEN }}
92+
9093
- run: task coding-standards:markdown:check
9194
# Check for any changes (task …:check runs task …:apply)
9295
- run: git diff --exit-code
@@ -99,6 +102,7 @@ jobs:
99102
- uses: arduino/setup-task@v2
100103
with:
101104
repo-token: ${{ secrets.GITHUB_TOKEN }}
105+
102106
- run: |
103107
docker network create frontend
104108
task compose -- up --detach
@@ -115,6 +119,7 @@ jobs:
115119
- uses: arduino/setup-task@v2
116120
with:
117121
repo-token: ${{ secrets.GITHUB_TOKEN }}
122+
118123
- run: |
119124
docker network create frontend
120125
task compose -- up --detach
@@ -131,6 +136,7 @@ jobs:
131136
- uses: arduino/setup-task@v2
132137
with:
133138
repo-token: ${{ secrets.GITHUB_TOKEN }}
139+
134140
- run: |
135141
docker network create frontend
136142
task compose -- up --detach

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,16 @@ Versioning](https://semver.org/spec/v2.0.0.html).
2222
* [PR-491](https://github.com/itk-dev/hoeringsportal/pull/491)
2323
Optimized development setup
2424

25+
## [4.9.0] - 2025-03-25
26+
27+
* [PR-484](https://github.com/itk-dev/hoeringsportal/pull/484)
28+
Added token to `arduino/setup-task`
29+
* [PR-483](https://github.com/itk-dev/hoeringsportal/pull/483)
30+
Made exports consistent
31+
* [PR-482](https://github.com/itk-dev/hoeringsportal/pull/482)
32+
* Updated role permissions
33+
* Updated user fixtures to create a user for each role
34+
2535
## [4.8.7] - 2025-04-04
2636

2737
* [PR-488](https://github.com/itk-dev/hoeringsportal/pull/488)
@@ -423,7 +433,8 @@ Updated drupal core 8.6.16
423433

424434
Initial release
425435

426-
[Unreleased]: https://github.com/itk-dev/hoeringsportal/compare/4.8.5...HEAD
436+
[Unreleased]: https://github.com/itk-dev/hoeringsportal/compare/4.9.0...HEAD
437+
[4.9.0]: https://github.com/itk-dev/hoeringsportal/compare/4.8.5...4.9.0
427438
[4.8.5]: https://github.com/itk-dev/hoeringsportal/compare/4.8.4...4.8.5
428439
[4.8.4]: https://github.com/itk-dev/hoeringsportal/compare/4.8.3...4.8.4
429440
[4.8.3]: https://github.com/itk-dev/hoeringsportal/compare/4.8.2...4.8.3

config/sync/openid_connect.client.generic.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ langcode: en
33
status: true
44
dependencies: { }
55
id: generic
6-
label: generic
6+
label: Medarbejderlogin
77
plugin: generic
88
settings:
99
client_id: client-id

config/sync/openid_connect.settings.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,13 @@ redirect_logout: ''
1111
userinfo_mappings:
1212
timezone: zoneinfo
1313
role_mappings:
14-
editor: { }
15-
administrator: { }
14+
citizen_proposal_editor:
15+
- citizen_proposal_editor
16+
administrator:
17+
- administrator
18+
hearing_editor:
19+
- hearing_editor
20+
project_editor:
21+
- project_editor
22+
public_meeting_editor:
23+
- public_meeting_editor

config/sync/system.action.user_add_role_action.editor.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

config/sync/system.action.user_remove_role_action.editor.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

config/sync/user.role.citizen_proposal_editor.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,34 @@ dependencies:
1010
- filter
1111
- hoeringsportal_citizen_proposal
1212
- node
13+
- publication_date
1314
- system
15+
- toolbar
1416
- view_unpublished
1517
- webform
1618
id: citizen_proposal_editor
17-
label: 'Citizen proposal editor'
19+
label: Borgerforslagsredaktør
1820
weight: -8
1921
is_admin: null
2022
permissions:
2123
- 'access content overview'
24+
- 'access toolbar'
2225
- 'access webform overview'
2326
- 'access webform submission user'
2427
- 'administer citizen proposal'
2528
- 'create webform'
29+
- 'delete any citizen_proposal content'
30+
- 'delete citizen_proposal revisions'
31+
- 'delete own citizen_proposal content'
2632
- 'delete own files'
2733
- 'edit any citizen_proposal content'
2834
- 'edit any webform'
35+
- 'edit own citizen_proposal content'
36+
- 'revert citizen_proposal revisions'
37+
- 'set citizen_proposal published on date'
2938
- 'support citizen proposal on behalf of citizen'
3039
- 'use text format email_html'
3140
- 'view any unpublished citizen_proposal content'
3241
- 'view any webform submission'
42+
- 'view citizen_proposal revisions'
3343
- 'view the administration theme'

config/sync/user.role.editor.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

config/sync/user.role.hearing_editor.yml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,49 @@ langcode: da
33
status: true
44
dependencies:
55
config:
6+
- entity_browser.browser.itk_document_browser
7+
- entity_browser.browser.itk_image_browser
68
- filter.format.email_html
9+
- media.type.document
10+
- media.type.image
711
- node.type.hearing
812
module:
13+
- entity_browser
914
- file
1015
- filter
16+
- media
1117
- node
18+
- quick_node_clone
1219
- system
13-
- webform
20+
- toolbar
21+
- view_unpublished
1422
id: hearing_editor
15-
label: 'Hearing editor'
23+
label: Høringsredaktør
1624
weight: -5
1725
is_admin: null
1826
permissions:
1927
- 'access content overview'
20-
- 'access webform overview'
28+
- 'access itk_document_browser entity browser pages'
29+
- 'access itk_image_browser entity browser pages'
30+
- 'access media overview'
31+
- 'access toolbar'
32+
- 'clone hearing content'
33+
- 'create document media'
2134
- 'create hearing content'
35+
- 'create image media'
36+
- 'delete any hearing content'
37+
- 'delete hearing revisions'
38+
- 'delete own document media'
2239
- 'delete own files'
40+
- 'delete own hearing content'
41+
- 'delete own image media'
2342
- 'edit any hearing content'
43+
- 'edit own document media'
44+
- 'edit own hearing content'
45+
- 'edit own image media'
46+
- 'revert hearing revisions'
2447
- 'use text format email_html'
48+
- 'view any unpublished hearing content'
49+
- 'view hearing revisions'
50+
- 'view own unpublished media'
2551
- 'view the administration theme'

config/sync/user.role.project_editor.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,27 @@ status: true
44
dependencies:
55
config:
66
- block_content.type.aside_contact_info
7+
- entity_browser.browser.itk_document_browser
8+
- entity_browser.browser.itk_image_browser
79
- media.type.document
810
- media.type.image
911
- node.type.project
1012
- node.type.project_main_page
13+
- node.type.project_page
1114
- taxonomy.vocabulary.timeline_item_types
1215
module:
1316
- block_content
1417
- entity_browser
1518
- media
1619
- node
20+
- publication_date
1721
- quick_node_clone
1822
- system
1923
- taxonomy
2024
- toolbar
25+
- view_unpublished
2126
id: project_editor
22-
label: 'Project editor'
27+
label: Projektredaktør
2328
weight: -5
2429
is_admin: null
2530
permissions:
@@ -32,36 +37,50 @@ permissions:
3237
- 'access toolbar'
3338
- 'clone project content'
3439
- 'clone project_main_page content'
40+
- 'clone project_page content'
3541
- 'create aside_contact_info block content'
3642
- 'create document media'
3743
- 'create image media'
3844
- 'create project content'
3945
- 'create project_main_page content'
46+
- 'create project_page content'
4047
- 'create terms in timeline_item_types'
4148
- 'delete any aside_contact_info block content'
4249
- 'delete any aside_contact_info block content revisions'
4350
- 'delete any project content'
4451
- 'delete any project_main_page content'
52+
- 'delete any project_page content'
4553
- 'delete own document media'
4654
- 'delete own image media'
4755
- 'delete own project content'
4856
- 'delete own project_main_page content'
57+
- 'delete own project_page content'
4958
- 'delete project revisions'
5059
- 'delete project_main_page revisions'
60+
- 'delete project_page revisions'
5161
- 'delete terms in timeline_item_types'
5262
- 'edit any aside_contact_info block content'
5363
- 'edit any project content'
5464
- 'edit any project_main_page content'
65+
- 'edit any project_page content'
5566
- 'edit own document media'
5667
- 'edit own image media'
68+
- 'edit own project_main_page content'
69+
- 'edit own project_page content'
5770
- 'edit terms in timeline_item_types'
5871
- 'revert any aside_contact_info block content revisions'
5972
- 'revert project revisions'
6073
- 'revert project_main_page revisions'
74+
- 'revert project_page revisions'
75+
- 'set project_main_page published on date'
76+
- 'set project_page published on date'
6177
- 'view any aside_contact_info block content history'
78+
- 'view any unpublished project_main_page content'
79+
- 'view any unpublished project_page content'
6280
- 'view media'
6381
- 'view own unpublished content'
6482
- 'view own unpublished media'
6583
- 'view project revisions'
6684
- 'view project_main_page revisions'
85+
- 'view project_page revisions'
6786
- 'view the administration theme'

0 commit comments

Comments
 (0)