diff --git a/composer.lock b/composer.lock index dfdf10b3..49b5d280 100644 --- a/composer.lock +++ b/composer.lock @@ -3956,16 +3956,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6" + "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/e8a7a7e74cd2f77d322c352d0778276df2bd1be6", - "reference": "e8a7a7e74cd2f77d322c352d0778276df2bd1be6", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/a01a197d7dcef0dcd10935c41955b69c6d216385", + "reference": "a01a197d7dcef0dcd10935c41955b69c6d216385", "shasum": "" }, "require": { @@ -3983,23 +3983,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-02-17T12:43:22+00:00" + "time": "2023-04-04T08:26:28+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.0.20", + "version": "3.0.23", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "adee6ff048849a42f01f78d539264b6e160482ac" + "reference": "55b4496205c61b6d298124b0ade4b43f034ac33a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/adee6ff048849a42f01f78d539264b6e160482ac", - "reference": "adee6ff048849a42f01f78d539264b6e160482ac", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/55b4496205c61b6d298124b0ade4b43f034ac33a", + "reference": "55b4496205c61b6d298124b0ade4b43f034ac33a", "shasum": "" }, "require": { @@ -4101,10 +4101,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.20", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.23", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-04-04T07:00:17+00:00" + "time": "2023-04-05T06:46:56+00:00" }, { "name": "drupal/helfi_proxy", @@ -9761,25 +9761,25 @@ }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -9808,9 +9808,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/master" + "source": "https://github.com/php-fig/http-message/tree/1.1" }, - "time": "2016-08-06T14:39:51+00:00" + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -15419,16 +15419,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.16.1", + "version": "1.17.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571" + "reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/e27e92d939e2e3636f0a1f0afaba59692c0bf571", - "reference": "e27e92d939e2e3636f0a1f0afaba59692c0bf571", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/d3753fcb3abc6f78f5de6f72153d4b9c99c72dee", + "reference": "d3753fcb3abc6f78f5de6f72153d4b9c99c72dee", "shasum": "" }, "require": { @@ -15458,9 +15458,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.16.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.17.1" }, - "time": "2023-02-07T18:11:17+00:00" + "time": "2023-04-04T11:11:22+00:00" }, { "name": "phpstan/phpstan", 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 45675f2d..0425287d 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 @@ -16,9 +16,8 @@ dependencies: - paragraphs - path - readonly_field_widget - - select2 _core: - default_config_hash: YWnRrqJSaeQZEwAqgArp65Mhok9h6tEU1KTO5KzRl80 + default_config_hash: cotjiL17Qafj5pirtPax237aflvFs_-3pKHSP6wblrg id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -123,16 +122,6 @@ 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: 28 @@ -323,6 +312,7 @@ content: third_party_settings: { } hidden: created: true + field_districts: true hide_description: true ontologyword_ids: true show_www: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index 00bb90de..282035a8 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -19,7 +19,7 @@ dependencies: - telephone - text _core: - default_config_hash: hE7e67UYGx1YHjoKPWu1fY3mmmgMH6cF6P3JK5kWyWs + default_config_hash: Zg1dRaAcdqWrYdUQPfrE3NjtAFm507U4rg_8LPIPhWA id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml index 58f78f64..f5e8394c 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml @@ -13,7 +13,7 @@ dependencies: - address - helfi_tpr _core: - default_config_hash: '-PlL5PW4ox5Omj4LpofJ5LrLgrYahOxcc1Cku386V-o' + default_config_hash: CmgZbjhEqqtXajBdd0qdd1pKeF8AlLnIjmX77kO52jk id: tpr_unit.tpr_unit.minimal targetEntityType: tpr_unit bundle: tpr_unit diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index 9bb58d8d..f3de619a 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -15,7 +15,7 @@ dependencies: - helfi_tpr - imagecache_external _core: - default_config_hash: CSGZthOWS5PNgCpEcOhdUYSQvJyYAJhDMvhkD2RotHU + default_config_hash: E_I6tFu_ojyafS1ARj9pBdic7fwoYSiFD1UOeVO-eEo id: tpr_unit.tpr_unit.teaser targetEntityType: tpr_unit bundle: tpr_unit diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index 1408ede1..2d1b6150 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -16,7 +16,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: VNYTo5CntTn6nX5XMd8B4xqHRx0QiKEw4hPFz6MahI8 + default_config_hash: 4Y6H4T5UpKZSpYZp9BRJvH-cgRpJ9kH2A7-uMC5cioU id: tpr_unit.tpr_unit.teaser_with_image targetEntityType: tpr_unit bundle: tpr_unit diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index 38b035ba..14d6883e 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -16,7 +16,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: FcgNfzTLT58CIquKCO2pxW7C9uzpL7SCZH-9Irm_QT8 + default_config_hash: fg5HihHWCdwJOdmXVRbiQKj5e9jCOJd4f9lqh0xUZLM id: tpr_unit.tpr_unit.wide_teaser targetEntityType: tpr_unit bundle: tpr_unit diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index cd483311..b08e229d 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -51,7 +51,6 @@ module: helfi_media_chart: 0 helfi_media_map: 0 helfi_media_remote_video: 0 - helfi_navigation: 0 helfi_node_announcement: 0 helfi_node_landing_page: 0 helfi_node_page: 0 @@ -151,6 +150,7 @@ module: views_bulk_edit: 0 views_bulk_operations: 0 views_ui: 0 + helfi_navigation: 1 pathauto: 1 content_translation: 10 externalauth: 10 diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index 254951ba..c78b7e9c 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor _core: - default_config_hash: qzfQkbDlRrvJYmtw-GQxVbfbY8qjjMFRj5h2dmtZ_p8 + default_config_hash: mx77BnIuTY8Yrm6IkLsHnEOv6JJrHPMD_kKgjP0DVi4 format: full_html editor: ckeditor settings: diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml index c702930a..ca3cac74 100644 --- a/conf/cmi/editor.editor.minimal.yml +++ b/conf/cmi/editor.editor.minimal.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor _core: - default_config_hash: HEqlBl4yZwyvwM419DdClQNeHaD3d5x3pSB-0brI7oM + default_config_hash: UYVamJgeMVQeM3VYumbShc-tGJoYe4RhrXqiL_tJw4c format: minimal editor: ckeditor settings: diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index 643a9120..094069d6 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,7 @@ dependencies: - helfi_api_base - linkit _core: - default_config_hash: la14IsxmWgnNQRyzGkX-FCWVKGj5s7QDL8IHFGbLuXQ + default_config_hash: nhRyMD2DLIUZvFqqCGT5FZbfF9HUbPbm_B7Uz8-6E_E name: HTML format: full_html weight: 0 @@ -24,7 +24,7 @@ filters: status: true weight: -50 settings: - allowed_html: '