Skip to content

Commit 0d02658

Browse files
Merge pull request #14 from AndreasEngelmark/development
Merge prior to deploy on 2022-06-03
2 parents a0958b6 + eb3a9a1 commit 0d02658

File tree

52 files changed

+8251
-8682
lines changed

Some content is hidden

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

52 files changed

+8251
-8682
lines changed

config/sync/block.block.os2loop_theme_page_title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ settings:
2222
visibility:
2323
request_path:
2424
id: request_path
25-
pages: "/node/add/*\r\n/user/*"
25+
pages: "/node/add/*\r\n/user/*\r\n/contacts"
2626
negate: false

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

Lines changed: 48 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,41 @@ dependencies:
88
- field.field.node.os2loop_documents_document.os2loop_documents_document_conte
99
- field.field.node.os2loop_documents_document.os2loop_documents_info_box
1010
- field.field.node.os2loop_documents_document.os2loop_notify_users
11+
- field.field.node.os2loop_documents_document.os2loop_shared_approval_date
12+
- field.field.node.os2loop_documents_document.os2loop_shared_approver
1113
- field.field.node.os2loop_documents_document.os2loop_shared_category
1214
- field.field.node.os2loop_documents_document.os2loop_shared_profession
1315
- field.field.node.os2loop_documents_document.os2loop_shared_rev_date
1416
- field.field.node.os2loop_documents_document.os2loop_shared_subject
1517
- field.field.node.os2loop_documents_document.os2loop_shared_tags
18+
- field.field.node.os2loop_documents_document.os2loop_shared_version
1619
- node.type.os2loop_documents_document
1720
module:
1821
- autocomplete_deluxe
1922
- datetime
23+
- field_group
2024
- paragraphs
2125
- path
2226
- text
27+
third_party_settings:
28+
field_group:
29+
group_metadata:
30+
children:
31+
- os2loop_shared_version
32+
- os2loop_shared_approver
33+
- os2loop_shared_approval_date
34+
- os2loop_shared_rev_date
35+
parent_name: ''
36+
weight: 12
37+
format_type: fieldset
38+
region: content
39+
format_settings:
40+
show_empty_fields: false
41+
id: ''
42+
classes: ''
43+
description: ''
44+
required_fields: true
45+
label: Metadata
2346
id: node.os2loop_documents_document.default
2447
targetEntityType: node
2548
bundle: os2loop_documents_document
@@ -68,12 +91,26 @@ content:
6891
type: text_textarea
6992
region: content
7093
os2loop_notify_users:
71-
weight: 26
94+
weight: 15
7295
settings:
7396
display_label: true
7497
third_party_settings: { }
7598
type: boolean_checkbox
7699
region: content
100+
os2loop_shared_approval_date:
101+
weight: 28
102+
settings: { }
103+
third_party_settings: { }
104+
type: datetime_default
105+
region: content
106+
os2loop_shared_approver:
107+
weight: 27
108+
settings:
109+
size: 60
110+
placeholder: ''
111+
third_party_settings: { }
112+
type: string_textfield
113+
region: content
77114
os2loop_shared_category:
78115
weight: 8
79116
settings:
@@ -102,7 +139,7 @@ content:
102139
type: autocomplete_deluxe
103140
region: content
104141
os2loop_shared_rev_date:
105-
weight: 12
142+
weight: 29
106143
settings: { }
107144
third_party_settings: { }
108145
type: datetime_default
@@ -141,9 +178,17 @@ content:
141178
third_party_settings: { }
142179
type: autocomplete_deluxe
143180
region: content
181+
os2loop_shared_version:
182+
weight: 26
183+
settings:
184+
size: 60
185+
placeholder: ''
186+
third_party_settings: { }
187+
type: string_textfield
188+
region: content
144189
path:
145190
type: path
146-
weight: 13
191+
weight: 14
147192
region: content
148193
settings: { }
149194
third_party_settings: { }

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,19 +92,12 @@ content:
9292
weight: 8
9393
os2loop_shared_subject:
9494
settings:
95-
match_limit: '0'
96-
min_length: 0
97-
delimiter: ''
98-
not_found_message: 'The term ''@term'' will be added'
99-
no_empty_message: 'No terms could be found. Please type in order to add a new term.'
100-
not_found_message_allow: false
101-
new_terms: false
10295
match_operator: CONTAINS
103-
autocomplete_route_name: autocomplete_deluxe.autocomplete
96+
match_limit: 10
10497
size: 60
105-
selection_handler: default
98+
placeholder: ''
10699
third_party_settings: { }
107-
type: autocomplete_deluxe
100+
type: entity_reference_autocomplete
108101
region: content
109102
weight: 7
110103
os2loop_shared_tags:

config/sync/core.entity_form_display.user.user.default.yml

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,11 @@ third_party_settings:
8585
id: ''
8686
classes: ''
8787
label: Jobtitel
88-
group_member_list:
89-
children:
90-
- os2loop_user_internal_list
91-
- os2loop_user_external_list
92-
parent_name: ''
93-
weight: 5
94-
format_type: fieldset
95-
region: content
96-
format_settings:
97-
id: ''
98-
classes: ''
99-
description: ''
100-
required_fields: true
101-
label: Medlemsliste
10288
group_notifications:
10389
children:
10490
- os2loop_mail_notifications_intvl
10591
parent_name: ''
106-
weight: 6
92+
weight: 5
10793
format_type: fieldset
10894
region: content
10995
format_settings:
@@ -164,16 +150,9 @@ content:
164150
size: 60
165151
placeholder: ''
166152
third_party_settings: { }
167-
os2loop_user_external_list:
168-
weight: 20
169-
settings:
170-
display_label: true
171-
third_party_settings: { }
172-
type: boolean_checkbox
173-
region: content
174153
os2loop_user_family_name:
175154
type: string_textfield
176-
weight: 20
155+
weight: 11
177156
region: content
178157
settings:
179158
size: 60
@@ -200,13 +179,6 @@ content:
200179
collapsed: false
201180
third_party_settings: { }
202181
region: content
203-
os2loop_user_internal_list:
204-
weight: 10
205-
settings:
206-
display_label: true
207-
third_party_settings: { }
208-
type: boolean_checkbox
209-
region: content
210182
os2loop_user_job_title:
211183
type: string_textfield
212184
weight: 10
@@ -217,7 +189,7 @@ content:
217189
third_party_settings: { }
218190
os2loop_user_phone_number:
219191
type: string_textfield
220-
weight: 30
192+
weight: 13
221193
region: content
222194
settings:
223195
size: 60
@@ -260,4 +232,6 @@ hidden:
260232
account: true
261233
langcode: true
262234
language: true
235+
os2loop_user_external_list: true
236+
os2loop_user_internal_list: true
263237
timezone: true

0 commit comments

Comments
 (0)