Skip to content

Commit ad9aa27

Browse files
committed
Merge branch 'develop'
2 parents 58a5802 + 8d052f3 commit ad9aa27

File tree

15 files changed

+389
-49
lines changed

15 files changed

+389
-49
lines changed
2.44 KB
Binary file not shown.

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ Versioning](https://semver.org/spec/v2.0.0.html).
88

99
## [Unreleased]
1010

11+
- [PR-362](https://github.com/itk-dev/os2loop/pull/362)
12+
- Change Share with a friend form
13+
- Add chosen lib
14+
- Use chosen lib for profession and expertise fields
15+
- [PR-361](https://github.com/itk-dev/os2loop/pull/361)
16+
Added local OIDC server-mock
17+
1118
## [1.1.1]
1219

1320
- [PR-360](https://github.com/itk-dev/os2loop/pull/360)

composer.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"drupal/autocomplete_deluxe": "^2.0",
1414
"drupal/better_formats": "^1.0@beta",
1515
"drupal/block_field": "^1.0@RC",
16+
"drupal/chosen": "^4.0",
1617
"drupal/color": "^1.0",
1718
"drupal/config_ignore": "^2.4",
1819
"drupal/convert_media_tags_to_markup": "^3.0",
@@ -57,7 +58,8 @@
5758
"drupal/views_flag_refresh": "^1.0",
5859
"drupal/viewsreference": "^2.0@beta",
5960
"drupal/xls_serialization": "^1.3",
60-
"drush/drush": "^12.2"
61+
"drush/drush": "^12.2",
62+
"jjj/chosen": "2.2.1"
6163
},
6264
"require-dev": {
6365
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
@@ -82,6 +84,19 @@
8284
"url": "https://packages.drupal.org/8",
8385
"canonical": false
8486
},
87+
"chosen": {
88+
"type": "package",
89+
"package": {
90+
"name": "jjj/chosen",
91+
"type": "drupal-library",
92+
"version": "2.2.1",
93+
"source": {
94+
"type": "git",
95+
"url": "https://github.com/JJJ/chosen.git",
96+
"reference": "2.2.1"
97+
}
98+
}
99+
},
85100
"drupal/theme_switcher": {
86101
"type": "vcs",
87102
"url": "https://git.drupalcode.org/project/theme_switcher"

composer.lock

Lines changed: 154 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/sync/chosen.settings.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
_core:
2+
default_config_hash: OHFGY8dygN7xT4c0vdvK-HmdGFN61Sww_KLKfBkIrWc
3+
minimum_single: 20
4+
minimum_multiple: 20
5+
disable_search_threshold: 0
6+
minimum_width: 0
7+
use_relative_width: false
8+
jquery_selector: 'select:visible'
9+
search_contains: false
10+
disable_search: false
11+
allow_single_deselect: false
12+
add_helper_buttons: false
13+
placeholder_text_multiple: 'Choose some options'
14+
placeholder_text_single: 'Choose an option'
15+
no_results_text: 'No results match'
16+
max_shown_results: null
17+
disabled_themes: { }
18+
chosen_include: 2

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

Lines changed: 10 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies:
2020
- field.field.user.user.os2loop_user_postal_code
2121
- field.field.user.user.os2loop_user_professions
2222
module:
23-
- autocomplete_deluxe
23+
- chosen_field
2424
- field_group
2525
- inline_entity_form
2626
- user
@@ -123,21 +123,10 @@ content:
123123
placeholder: ''
124124
third_party_settings: { }
125125
os2loop_user_areas_of_expertise:
126-
type: autocomplete_deluxe
126+
type: chosen_select
127127
weight: 20
128128
region: content
129-
settings:
130-
match_operator: CONTAINS
131-
autocomplete_route_name: autocomplete_deluxe.autocomplete
132-
size: 60
133-
selection_handler: default
134-
min_length: 0
135-
delimiter: ''
136-
not_found_message_allow: false
137-
not_found_message: "The term '@term' will be added"
138-
new_terms: false
139-
no_empty_message: 'No terms could be found. Please type in order to add a new term.'
140-
match_limit: '0'
129+
settings: { }
141130
third_party_settings: { }
142131
os2loop_user_biography:
143132
type: string_textarea
@@ -180,9 +169,14 @@ content:
180169
override_labels: false
181170
label_singular: ''
182171
label_plural: ''
172+
allow_new: true
173+
hide_fieldset: false
174+
hide_title: false
183175
collapsible: false
184176
collapsed: false
185177
revision: false
178+
config_labels_button: _none
179+
labels: { }
186180
third_party_settings: { }
187181
os2loop_user_job_title:
188182
type: string_textfield
@@ -217,21 +211,10 @@ content:
217211
placeholder: ''
218212
third_party_settings: { }
219213
os2loop_user_professions:
220-
type: autocomplete_deluxe
214+
type: chosen_select
221215
weight: 30
222216
region: content
223-
settings:
224-
match_operator: CONTAINS
225-
autocomplete_route_name: autocomplete_deluxe.autocomplete
226-
size: 60
227-
selection_handler: default
228-
min_length: 0
229-
delimiter: ''
230-
not_found_message_allow: false
231-
not_found_message: "The term '@term' will be added"
232-
new_terms: false
233-
no_empty_message: 'No terms could be found. Please type in order to add a new term.'
234-
match_limit: '0'
217+
settings: { }
235218
third_party_settings: { }
236219
hidden:
237220
langcode: true

config/sync/core.extension.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ module:
55
block: 0
66
block_field: 0
77
breakpoint: 0
8+
chosen: 0
9+
chosen_field: 0
10+
chosen_lib: 0
811
ckeditor5: 0
912
comment: 0
1013
config_filter: 0
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
placeholder_text_multiple: Vælg
2+
placeholder_text_single: Vælg
3+
no_results_text: 'Intet resultat'
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
uuid: 398e2246-b9c9-4721-8036-28076d5028c8
2-
langcode: en
2+
langcode: da
33
status: true
44
dependencies: { }
55
id: generic
66
label: generic
77
plugin: generic
88
settings:
9-
client_id: "file:///settings.local.php#$config['openid_connect.client.generic']['settings']['client_id']"
10-
client_secret: "file:///settings.local.php#$config['openid_connect.client.generic']['settings']['client_secret']"
9+
client_id: client-id
10+
client_secret: '[client-secret]'
11+
iss_allowed_domains: ''
1112
issuer_url: ''
12-
authorization_endpoint: "file:///settings.local.php#$config['openid_connect.client.generic]['settings']['client_id']"
13-
token_endpoint: "file:///settings.local.php#$config['openid_connect.client.generic]['settings'][token_endpoint']"
13+
authorization_endpoint: 'https://idp-citizen.os2loop.local.itkdev.dk/connect/authorize'
14+
token_endpoint: 'https://idp-citizen.os2loop.local.itkdev.dk/connect/token'
1415
userinfo_endpoint: ''
15-
end_session_endpoint: ''
16+
end_session_endpoint: 'https://idp-citizen.os2loop.local.itkdev.dk/connect/endsession'
1617
scopes:
1718
- openid
18-
- email

config/sync/openid_connect.settings.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ connect_existing_users: true
33
override_registration_settings: true
44
end_session_enabled: true
55
user_login_display: above
6-
redirect_login: ''
7-
redirect_logout: ''
6+
redirect_login: 'http://os2loop.local.itkdev.dk/user/login'
7+
redirect_logout: 'http://os2loop.local.itkdev.dk/user/logout'
88
userinfo_mappings:
99
timezone: zoneinfo
1010
os2loop_user_family_name: family_name

0 commit comments

Comments
 (0)