diff --git a/composer.lock b/composer.lock index 5224e3b4..b18b6248 100644 --- a/composer.lock +++ b/composer.lock @@ -4073,16 +4073,16 @@ }, { "name": "drupal/hdbt", - "version": "6.8.29", + "version": "6.8.32", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "46c6f98c115bd2b1cc130655cdd9c1253451427b" + "reference": "2b6a5b82b59927cb7cf6beeface334daf34f96a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/46c6f98c115bd2b1cc130655cdd9c1253451427b", - "reference": "46c6f98c115bd2b1cc130655cdd9c1253451427b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/2b6a5b82b59927cb7cf6beeface334daf34f96a5", + "reference": "2b6a5b82b59927cb7cf6beeface334daf34f96a5", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.29", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.8.32", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-01-09T12:37:24+00:00" + "time": "2025-01-13T06:44:40+00:00" }, { "name": "drupal/hdbt_admin", @@ -4410,16 +4410,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.12.0", + "version": "4.12.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "983a87e51ffdce5886bd9607fc0694c1d04ca91c" + "reference": "fb0ab912a4fe38d695cbfeb84ee623ea644dd6a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/983a87e51ffdce5886bd9607fc0694c1d04ca91c", - "reference": "983a87e51ffdce5886bd9607fc0694c1d04ca91c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fb0ab912a4fe38d695cbfeb84ee623ea644dd6a2", + "reference": "fb0ab912a4fe38d695cbfeb84ee623ea644dd6a2", "shasum": "" }, "require": { @@ -4543,10 +4543,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2025-01-08T12:14:37+00:00" + "time": "2025-01-13T06:44:52+00:00" }, { "name": "drupal/helfi_proxy", @@ -4595,16 +4595,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.10", + "version": "2.3.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c" + "reference": "f7c04cdf1c4bfed2d075457429b66906828ffefa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/d98687373b1cb4647ad576403e470f049c7a4d3c", - "reference": "d98687373b1cb4647ad576403e470f049c7a4d3c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/f7c04cdf1c4bfed2d075457429b66906828ffefa", + "reference": "f7c04cdf1c4bfed2d075457429b66906828ffefa", "shasum": "" }, "require": { @@ -4630,10 +4630,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.10", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.11", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2024-11-29T09:43:38+00:00" + "time": "2025-01-10T08:30:42+00:00" }, { "name": "drupal/helfi_tunnistamo", diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml index 6297915d..c22cddb0 100644 --- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -147,6 +147,16 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } + field_districts: + type: select2_entity_reference + weight: 29 + region: content + settings: + width: 100% + autocomplete: false + match_operator: STARTS_WITH + match_limit: 10 + third_party_settings: { } field_lower_content: type: paragraphs weight: 33 @@ -434,16 +444,6 @@ content: formatter_settings: { } show_description: false third_party_settings: { } - field_districts: - type: select2_entity_reference - weight: 29 - region: content - settings: - width: 100% - autocomplete: false - match_operator: STARTS_WITH - match_limit: 10 - third_party_settings: { } hidden: created: true hide_description: true diff --git a/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml index 06660f47..d11ac5ab 100644 --- a/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml +++ b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml @@ -1 +1 @@ -label: Minimal +label: Minimaalinen diff --git a/conf/cmi/language/fi/filter.format.minimal.yml b/conf/cmi/language/fi/filter.format.minimal.yml index 39e62d04..c83fc57e 100644 --- a/conf/cmi/language/fi/filter.format.minimal.yml +++ b/conf/cmi/language/fi/filter.format.minimal.yml @@ -1 +1 @@ -name: Minimal +name: Minimaalinen diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index dd75506a..cbd32963 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,6 +91,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -105,7 +106,6 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index 71f7600f..0a607f51 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index 893d1f1b..e32e9aff 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,6 +381,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -398,7 +399,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index e2ccbdeb..7e190ab5 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,6 +109,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -126,7 +127,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,6 +646,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -663,7 +664,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index b8a7f97d..a0bd2b1d 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,6 +93,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -110,7 +111,6 @@ display: offset: false offset_label: Offset quantity: 9 - pagination_heading_level: h4 exposed_form: type: basic options: