From 7f6ebc0a497163297625381aec7f11dc47d35d11 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Thu, 18 Jan 2024 06:43:13 +0000 Subject: [PATCH] Update configuration --- composer.lock | 36 +++++++++---------- ...form_display.tpr_unit.tpr_unit.default.yml | 23 ++---------- ...view_display.tpr_unit.tpr_unit.default.yml | 21 +++-------- ...views.view.comprehensive_school_search.yml | 25 ------------- ...views.view.comprehensive_school_search.yml | 26 -------------- 5 files changed, 24 insertions(+), 107 deletions(-) delete mode 100644 conf/cmi/language/fi/views.view.comprehensive_school_search.yml delete mode 100644 conf/cmi/language/sv/views.view.comprehensive_school_search.yml diff --git a/composer.lock b/composer.lock index 97f1426f..d74b5cc9 100644 --- a/composer.lock +++ b/composer.lock @@ -2090,16 +2090,16 @@ }, { "name": "drupal/core", - "version": "10.2.1", + "version": "10.2.2", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db" + "reference": "fc9abad1ab687635a5eddec00aa1a5f2a29a23bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/0050280087b8ed1fb145fcf22e01ad53c85931db", - "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db", + "url": "https://api.github.com/repos/drupal/core/zipball/fc9abad1ab687635a5eddec00aa1a5f2a29a23bd", + "reference": "fc9abad1ab687635a5eddec00aa1a5f2a29a23bd", "shasum": "" }, "require": { @@ -2247,9 +2247,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.2.1" + "source": "https://github.com/drupal/core/tree/10.2.2" }, - "time": "2024-01-05T09:27:16+00:00" + "time": "2024-01-16T21:10:58+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -4278,16 +4278,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.2", + "version": "4.3.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "9ac506631980648a339d9658e02f2ab00e307ef3" + "reference": "f0525ad7e6d4ca2bab419fbf8c80489cb60848e4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9ac506631980648a339d9658e02f2ab00e307ef3", - "reference": "9ac506631980648a339d9658e02f2ab00e307ef3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f0525ad7e6d4ca2bab419fbf8c80489cb60848e4", + "reference": "f0525ad7e6d4ca2bab419fbf8c80489cb60848e4", "shasum": "" }, "require": { @@ -4401,10 +4401,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.2", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.3", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-01-16T08:07:32+00:00" + "time": "2024-01-18T06:40:18+00:00" }, { "name": "drupal/helfi_proxy", @@ -4460,16 +4460,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "cf8fd5d9b66d629845c44c4d8a901e81e9caef11" + "reference": "2847282524718049218005a96bab1938dd760aef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/cf8fd5d9b66d629845c44c4d8a901e81e9caef11", - "reference": "cf8fd5d9b66d629845c44c4d8a901e81e9caef11", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/2847282524718049218005a96bab1938dd760aef", + "reference": "2847282524718049218005a96bab1938dd760aef", "shasum": "" }, "require": { @@ -4495,10 +4495,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-12-19T10:01:23+00:00" + "time": "2024-01-16T13:52:58+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 f8477dec..615c0103 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 @@ -21,7 +21,6 @@ dependencies: - paragraphs - path - readonly_field_widget - - select2 - text _core: default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM @@ -177,16 +176,6 @@ content: sidebar: false use_details: true third_party_settings: { } - field_ontologyword_details: - type: readonly_field_widget - weight: 40 - region: content - settings: - label: above - formatter_type: null - formatter_settings: { } - show_description: false - third_party_settings: { } field_unit_type: type: entity_reference_autocomplete weight: 30 @@ -384,16 +373,6 @@ content: formatter_settings: { } show_description: false third_party_settings: { } - subgroup: - type: readonly_field_widget - weight: 40 - region: content - settings: - label: above - formatter_type: null - formatter_settings: { } - show_description: false - third_party_settings: { } toc_enabled: type: boolean_checkbox weight: 3 @@ -447,7 +426,9 @@ hidden: field_categories: true field_districts: true field_hs_front_page: true + field_ontologyword_details: true field_study_field: true hide_description: true ontologyword_ids: true show_www: true + subgroup: 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 7f6663f1..e15a1f86 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 @@ -17,7 +17,6 @@ dependencies: - address - entity_reference_revisions - helfi_address_search - - helfi_kasko_content - helfi_tpr - imagecache_external - link @@ -140,14 +139,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 19 - region: content - field_ontologyword_details: - type: tpr_ontologyword_details_formatter - label: hidden - settings: { } - third_party_settings: { } - weight: 28 + weight: 17 region: content highlights: type: tpr_connection @@ -266,14 +258,7 @@ content: settings: link: true third_party_settings: { } - weight: 18 - region: content - subgroup: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 32 + weight: 16 region: content toc_enabled: type: boolean @@ -316,6 +301,7 @@ hidden: field_categories: true field_districts: true field_hs_front_page: true + field_ontologyword_details: true field_study_field: true field_unit_type: true hide_description: true @@ -323,3 +309,4 @@ hidden: search_api_excerpt: true show_www: true streetview_entrance_url: true + subgroup: true diff --git a/conf/cmi/language/fi/views.view.comprehensive_school_search.yml b/conf/cmi/language/fi/views.view.comprehensive_school_search.yml deleted file mode 100644 index 25ac5854..00000000 --- a/conf/cmi/language/fi/views.view.comprehensive_school_search.yml +++ /dev/null @@ -1,25 +0,0 @@ -label: Peruskouluhaku -display: - default: - display_title: Oletus - display_options: - title: Peruskouluhaku - pager: - options: - tags: - next: Seuraava - previous: Edellinen - first: Ensimmäinen - last: Viimeinen - expose: - items_per_page_label: 'Kohteita sivulla' - items_per_page_options_all_label: '- Kaikki -' - exposed_form: - options: - submit_button: Käytä - reset_button_label: Palauta - exposed_sorts_label: Järjestä - sort_asc_label: Nouseva - sort_desc_label: Laskeva - block: - display_title: Lohko diff --git a/conf/cmi/language/sv/views.view.comprehensive_school_search.yml b/conf/cmi/language/sv/views.view.comprehensive_school_search.yml deleted file mode 100644 index f21cb9b2..00000000 --- a/conf/cmi/language/sv/views.view.comprehensive_school_search.yml +++ /dev/null @@ -1,26 +0,0 @@ -label: 'Grundskola sök' -display: - default: - display_title: Förvald - display_options: - title: 'Grundskola sök' - pager: - options: - tags: - next: Nästa - previous: Föregående - first: Första - last: Sista - expose: - items_per_page_label: 'Inlägg per sida' - items_per_page_options_all_label: '- Alla -' - offset_label: Kompensera - exposed_form: - options: - submit_button: Filtrera - reset_button_label: Återställ - exposed_sorts_label: 'Sortera efter' - sort_asc_label: Stigande - sort_desc_label: Fallande - block: - display_title: Block