Skip to content

Commit 1ebcd35

Browse files
authored
Merge branch 'master' into develop
2 parents 2a4d97f + 123d488 commit 1ebcd35

File tree

10 files changed

+527
-69
lines changed

10 files changed

+527
-69
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ before starting to add changes. Use example [placed in the end of the page](#exa
3939
- [PR-222](https://github.com/OS2Forms/os2forms/pull/222)
4040
Correctly sets sender label on Maestro digital post notifications.
4141
- [OS-199] Remove modules that are not used and not covered by central maintenance from OS2forms
42+
- Avoid double-saving submissions when handling name and address protection.
43+
- [PR-191](https://github.com/OS2Forms/os2forms/pull/191)
44+
Re-throws exception to ensure failed status during Maestro notification job.
45+
- [PR-202](https://github.com/OS2Forms/os2forms/pull/202)
46+
- Removed non-digits from recipient id in Maestro digital post notifications.
47+
- [PR-189](https://github.com/OS2Forms/os2forms/pull/189)
48+
- Added support for MeMo 1.2 and added additional validation of MeMo actions.
4249

4350
## [4.1.0] 2025-06-03
4451

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"fig/http-message-util": "^1.1",
5454
"http-interop/http-factory-guzzle": "^1.0.0",
5555
"itk-dev/beskedfordeler-drupal": "^1.0",
56-
"itk-dev/serviceplatformen": "^1.5",
56+
"itk-dev/serviceplatformen": "^1.7.1",
5757
"mglaman/composer-drupal-lenient": "^1.0",
5858
"os2web/os2web_audit": "^1.0",
5959
"os2web/os2web_datalookup": "^3.0",

modules/os2forms_digital_post/modules/os2forms_digital_post_examples/config/install/webform.webform.os2forms_digital_post_example.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -240,14 +240,10 @@ handlers:
240240
actions:
241241
-
242242
action: INFORMATION
243-
url: 'http://dr.dk'
243+
url: '[site:url]'
244244
label: 'Se her!'
245245
-
246246
action: SELVBETJENING
247-
url: 'https://selvbetjening.aarhuskommune.dk/da/content/book-aarhus'
248-
label: 'Book ressource'
249-
-
250-
action: FORBEREDELSE
251-
url: 'http://tv2.dk'
252-
label: 'Forbered dig med'
247+
url: 'https://eksempel.dk'
248+
label: 'Eksempel'
253249
variants: { }
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,245 @@
1+
langcode: da
2+
status: open
3+
dependencies:
4+
enforced:
5+
module:
6+
- os2forms_digital_post_examples
7+
module:
8+
- os2forms_digital_post_examples
9+
third_party_settings:
10+
webform_revisions:
11+
contentEntity_id: null
12+
weight: 0
13+
open: null
14+
close: null
15+
uid: 1
16+
template: false
17+
archive: false
18+
id: os2forms_digital_post_example_2
19+
title: 'OS2Forms Digital post example with invalid handler URL'
20+
description: 'Simple example form with a digital post handler with invalid handler URL'
21+
category: Example
22+
elements: |-
23+
message:
24+
'#type': textarea
25+
'#title': Message
26+
'#required': true
27+
'#default_value': |-
28+
[current-date:long]
29+
30+
[random:hash:sha512]
31+
recipient_cpr:
32+
'#type': textfield
33+
'#title': 'Recipient cpr'
34+
'#required': true
35+
'#default_value': '1705880000'
36+
digital_post_content_pdf:
37+
'#type': 'webform_entity_print_attachment:pdf'
38+
'#title': 'Digital post (PDF)'
39+
'#display_on': view
40+
'#filename': hat-og-briller.pdf
41+
css: ''
42+
javascript: ''
43+
settings:
44+
ajax: false
45+
ajax_scroll_top: form
46+
ajax_progress_type: ''
47+
ajax_effect: ''
48+
ajax_speed: null
49+
page: true
50+
page_submit_path: ''
51+
page_confirm_path: ''
52+
page_theme_name: ''
53+
form_title: both
54+
form_submit_once: false
55+
form_open_message: ''
56+
form_close_message: ''
57+
form_exception_message: ''
58+
form_previous_submissions: true
59+
form_confidential: false
60+
form_confidential_message: ''
61+
form_disable_remote_addr: false
62+
form_convert_anonymous: false
63+
form_prepopulate: false
64+
form_prepopulate_source_entity: false
65+
form_prepopulate_source_entity_required: false
66+
form_prepopulate_source_entity_type: ''
67+
form_unsaved: false
68+
form_disable_back: false
69+
form_submit_back: false
70+
form_disable_autocomplete: false
71+
form_novalidate: false
72+
form_disable_inline_errors: false
73+
form_required: false
74+
form_autofocus: false
75+
form_details_toggle: false
76+
form_reset: false
77+
form_access_denied: default
78+
form_access_denied_title: ''
79+
form_access_denied_message: ''
80+
form_access_denied_attributes: { }
81+
form_file_limit: ''
82+
form_attributes: { }
83+
form_method: ''
84+
form_action: ''
85+
share: false
86+
share_node: false
87+
share_theme_name: ''
88+
share_title: true
89+
share_page_body_attributes: { }
90+
submission_label: ''
91+
submission_exception_message: ''
92+
submission_locked_message: ''
93+
submission_log: false
94+
submission_excluded_elements: { }
95+
submission_exclude_empty: false
96+
submission_exclude_empty_checkbox: false
97+
submission_views: { }
98+
submission_views_replace: { }
99+
submission_user_columns: { }
100+
submission_user_duplicate: false
101+
submission_access_denied: default
102+
submission_access_denied_title: ''
103+
submission_access_denied_message: ''
104+
submission_access_denied_attributes: { }
105+
previous_submission_message: ''
106+
previous_submissions_message: ''
107+
autofill: false
108+
autofill_message: ''
109+
autofill_excluded_elements: { }
110+
wizard_progress_bar: true
111+
wizard_progress_pages: false
112+
wizard_progress_percentage: false
113+
wizard_progress_link: false
114+
wizard_progress_states: false
115+
wizard_start_label: ''
116+
wizard_preview_link: false
117+
wizard_confirmation: true
118+
wizard_confirmation_label: ''
119+
wizard_auto_forward: true
120+
wizard_auto_forward_hide_next_button: false
121+
wizard_keyboard: true
122+
wizard_track: ''
123+
wizard_prev_button_label: ''
124+
wizard_next_button_label: ''
125+
wizard_toggle: false
126+
wizard_toggle_show_label: ''
127+
wizard_toggle_hide_label: ''
128+
preview: 0
129+
preview_label: ''
130+
preview_title: ''
131+
preview_message: ''
132+
preview_attributes: { }
133+
preview_excluded_elements: { }
134+
preview_exclude_empty: true
135+
preview_exclude_empty_checkbox: false
136+
draft: none
137+
draft_multiple: false
138+
draft_auto_save: false
139+
draft_saved_message: ''
140+
draft_loaded_message: ''
141+
draft_pending_single_message: ''
142+
draft_pending_multiple_message: ''
143+
confirmation_type: message
144+
confirmation_url: ''
145+
confirmation_title: ''
146+
confirmation_message: ''
147+
confirmation_attributes: { }
148+
confirmation_back: true
149+
confirmation_back_label: ''
150+
confirmation_back_attributes: { }
151+
confirmation_exclude_query: false
152+
confirmation_exclude_token: false
153+
confirmation_update: false
154+
limit_total: null
155+
limit_total_interval: null
156+
limit_total_message: ''
157+
limit_total_unique: false
158+
limit_user: null
159+
limit_user_interval: null
160+
limit_user_message: ''
161+
limit_user_unique: false
162+
entity_limit_total: null
163+
entity_limit_total_interval: null
164+
entity_limit_user: null
165+
entity_limit_user_interval: null
166+
purge: all
167+
purge_days: 30
168+
results_disabled: false
169+
results_disabled_ignore: false
170+
results_customize: false
171+
token_view: false
172+
token_update: false
173+
token_delete: false
174+
serial_disabled: false
175+
access:
176+
create:
177+
roles:
178+
- anonymous
179+
- authenticated
180+
users: { }
181+
permissions: { }
182+
view_any:
183+
roles: { }
184+
users: { }
185+
permissions: { }
186+
update_any:
187+
roles: { }
188+
users: { }
189+
permissions: { }
190+
delete_any:
191+
roles: { }
192+
users: { }
193+
permissions: { }
194+
purge_any:
195+
roles: { }
196+
users: { }
197+
permissions: { }
198+
view_own:
199+
roles: { }
200+
users: { }
201+
permissions: { }
202+
update_own:
203+
roles: { }
204+
users: { }
205+
permissions: { }
206+
delete_own:
207+
roles: { }
208+
users: { }
209+
permissions: { }
210+
administer:
211+
roles: { }
212+
users: { }
213+
permissions: { }
214+
test:
215+
roles: { }
216+
users: { }
217+
permissions: { }
218+
configuration:
219+
roles: { }
220+
users: { }
221+
permissions: { }
222+
handlers:
223+
digital_post_sf1601:
224+
id: digital_post_sf1601
225+
handler_id: digital_post_sf1601
226+
label: 'Digital post (sf1601)'
227+
notes: ''
228+
status: true
229+
conditions: { }
230+
weight: 0
231+
settings:
232+
debug: false
233+
memo_message:
234+
type: 'Automatisk Valg'
235+
recipient_element: recipient_cpr
236+
attachment_element: digital_post_content_pdf
237+
sender_label: 'Hilsen fra [site:url-brief]'
238+
message_header_label: SF1601
239+
memo_actions:
240+
actions:
241+
-
242+
action: INFORMATION
243+
url: 'http://eksempel.dk'
244+
label: 'Se her!'
245+
variants: { }

0 commit comments

Comments
 (0)