From 03493a37246898e774aee2a5cafa2532dde42319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 27 Jan 2025 09:52:34 +0200 Subject: [PATCH 1/5] Attempt to fix "Published" and "Unpublished" translations. --- .../language/fi/views.view.content.yml | 6 +- .../language/sv/views.view.content.yml | 68 +++++++++++++++++++ .../config/rewrite/views.view.content.yml | 1 + .../language/fi/views.view.locked_content.yml | 64 +++++++++++++++++ .../language/sv/views.view.locked_content.yml | 49 +++++++++++++ .../rewrite/views.view.locked_content.yml | 15 ++++ .../optional/language/fi/views.view.media.yml | 14 +--- .../language/fi/views.view.media_library.yml | 9 +-- .../optional/language/sv/views.view.media.yml | 14 +--- .../language/sv/views.view.media_library.yml | 14 ++-- .../rewrite/views.view.media_library.yml | 9 ++- .../fi/views.view.tpr_errand_service_list.yml | 9 +-- .../views.view.tpr_service_channel_list.yml | 9 +-- .../fi/views.view.tpr_service_list.yml | 9 +-- .../language/fi/views.view.tpr_unit_list.yml | 9 +-- .../sv/views.view.tpr_errand_service_list.yml | 11 +-- 16 files changed, 225 insertions(+), 85 deletions(-) create mode 100644 modules/hdbt_admin_tools/config/optional/language/sv/views.view.content.yml create mode 100644 modules/helfi_base_content/config/optional/language/fi/views.view.locked_content.yml create mode 100644 modules/helfi_base_content/config/optional/language/sv/views.view.locked_content.yml create mode 100644 modules/helfi_base_content/config/rewrite/views.view.locked_content.yml diff --git a/modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml b/modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml index 742fcb4e2..6f751bd71 100644 --- a/modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml +++ b/modules/hdbt_admin_tools/config/optional/language/fi/views.view.content.yml @@ -4,12 +4,10 @@ display: fields: langcode: label: Kieli - separator: ', ' title: label: Otsikko type: label: Sisältötyyppi - separator: ', ' name: label: Kirjoittaja status: @@ -52,9 +50,9 @@ display: group_info: label: Julkaisutila group_items: - - + 1: title: Julkaistu - - + 2: title: Julkaisematon langcode: expose: diff --git a/modules/hdbt_admin_tools/config/optional/language/sv/views.view.content.yml b/modules/hdbt_admin_tools/config/optional/language/sv/views.view.content.yml new file mode 100644 index 000000000..ddadfb958 --- /dev/null +++ b/modules/hdbt_admin_tools/config/optional/language/sv/views.view.content.yml @@ -0,0 +1,68 @@ +display: + default: + display_options: + fields: + langcode: + label: Språk + title: + label: Titel + type: + label: Innehållstyp + name: + label: Författare + status: + settings: + format_custom_false: 'Ej publicerad' + format_custom_true: Publicerad + changed: + label: Uppdaterad + operations: + label: Funktioner + title: Innehåll + pager: + options: + tags: + next: 'Nästa ›' + previous: '‹ Föregående' + first: '« Första' + last: 'Sista »' + exposed_form: + options: + submit_button: Filtrera + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + empty: + area_text_custom: + content: 'Inget innehåll tillgängligt.' + filters: + title: + expose: + label: Titel + type: + expose: + label: Innehållstyp + status: + expose: { } + group_info: + label: 'Status för publicering' + group_items: + 1: + title: Publicerad + 2: + title: 'Ej publicerad' + langcode: + expose: + label: Språk + display_title: Förvald + page_1: + display_title: Sida + display_options: + menu: + title: Innehåll + tab_options: + title: Innehåll + description: 'Hitta och hantera innehåll' +label: Innehåll +description: 'Hitta och hantera innehåll.' diff --git a/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml b/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml index 82bf2798f..0810c3db3 100644 --- a/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml +++ b/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml @@ -312,6 +312,7 @@ display: pager: type: full options: + pagination_heading_level: h4 items_per_page: 50 tags: next: 'Next ›' diff --git a/modules/helfi_base_content/config/optional/language/fi/views.view.locked_content.yml b/modules/helfi_base_content/config/optional/language/fi/views.view.locked_content.yml new file mode 100644 index 000000000..c4bd96799 --- /dev/null +++ b/modules/helfi_base_content/config/optional/language/fi/views.view.locked_content.yml @@ -0,0 +1,64 @@ +label: 'Lukitut sisällöt' +display: + default: + display_title: Oletus + display_options: + title: 'Lukitut sisällöt' + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + first: '« Ensimmäinen' + last: 'Viimeinen »' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + fields: + node_bulk_form: + label: 'Solmujen bulkkitoimintojen lomake' + action_title: Toiminto + title: + label: Otsikko + type: + label: Sisältötyyppi + name: + label: 'Lukituksen tekijä' + operations: + label: Toimenpiteet + timestamp: + label: 'Lukituksen ajankohta' + langcode_1: + label: 'Sisällön kieli' + filters: + status: + expose: + label: Julkaisutila + group_info: + label: Julkaisutila + group_items: + 1: + title: Julkaistu + 2: + title: Julkaisematon + type: + expose: + label: Sisältötyyppi + title: + expose: + label: Otsikko + empty: + area_text_custom: + content: 'Lukittua sisältöä ei ole.' + page_1: + display_title: Sivu + display_options: + menu: + title: 'Lukitut sisällöt' diff --git a/modules/helfi_base_content/config/optional/language/sv/views.view.locked_content.yml b/modules/helfi_base_content/config/optional/language/sv/views.view.locked_content.yml new file mode 100644 index 000000000..d61526643 --- /dev/null +++ b/modules/helfi_base_content/config/optional/language/sv/views.view.locked_content.yml @@ -0,0 +1,49 @@ +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + tags: + first: '« Första' + last: 'Sista »' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + fields: + node_bulk_form: + action_title: Åtgärd + title: + label: Titel + type: { } + name: { } + operations: + label: Funktioner + filters: + status: + expose: + label: 'Status för publicering' + group_info: + label: 'Status för publicering' + group_items: + 1: + title: Publicerad + 2: + title: 'Ej publicerad' + type: + expose: { } + title: + expose: + label: Titel + page_1: + display_title: Sida + display_options: + menu: { } diff --git a/modules/helfi_base_content/config/rewrite/views.view.locked_content.yml b/modules/helfi_base_content/config/rewrite/views.view.locked_content.yml new file mode 100644 index 000000000..cf2e59680 --- /dev/null +++ b/modules/helfi_base_content/config/rewrite/views.view.locked_content.yml @@ -0,0 +1,15 @@ +display: + default: + display_options: + filters: + status: + group_info: + group_items: + 1: + title: Published + operator: '=' + value: '1' + 2: + title: Unpublished + operator: '=' + value: '0' diff --git a/modules/helfi_media/config/optional/language/fi/views.view.media.yml b/modules/helfi_media/config/optional/language/fi/views.view.media.yml index 631b568f9..99e6fb59d 100644 --- a/modules/helfi_media/config/optional/language/fi/views.view.media.yml +++ b/modules/helfi_media/config/optional/language/fi/views.view.media.yml @@ -8,25 +8,19 @@ display: action_title: Toiminto thumbnail__target_id: label: Pienoiskuva - separator: ', ' name: label: 'Mediatiedoston nimi' - separator: ', ' bundle: label: Tyyppi - separator: ', ' uid: label: Kirjoittaja - separator: ', ' status: label: Tila settings: format_custom_false: Julkaisematon format_custom_true: Julkaistu - separator: ', ' changed: label: Päivitetty - separator: ', ' operations: label: Toimenpiteet pager: @@ -39,7 +33,6 @@ display: expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' - offset_label: Offset exposed_form: options: submit_button: Suodata @@ -60,6 +53,7 @@ display: status: expose: label: Tosi + description: '' group_info: label: Julkaisutila group_items: @@ -70,10 +64,6 @@ display: langcode: expose: label: Kieli - title: Media media_page_list: - display_title: Media display_options: - menu: - title: Media -label: Media + menu: { } diff --git a/modules/helfi_media/config/optional/language/fi/views.view.media_library.yml b/modules/helfi_media/config/optional/language/fi/views.view.media_library.yml index 3ac1af279..145331e58 100644 --- a/modules/helfi_media/config/optional/language/fi/views.view.media_library.yml +++ b/modules/helfi_media/config/optional/language/fi/views.view.media_library.yml @@ -15,7 +15,6 @@ display: expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' - offset_label: Offset exposed_form: options: submit_button: 'Suodata tuloksia' @@ -40,11 +39,14 @@ display: status: expose: label: 'Julkaisun tila' + description: '' group_info: label: Julkaistu group_items: 1: title: Julkaistu + 2: + title: Julkaisematon name: expose: label: Nimi @@ -53,10 +55,10 @@ display: label: 'Median tyyppi' group_info: label: 'Median tyyppi' + description: '' langcode: expose: label: Kieli - title: Media page: display_title: Sivu display_options: @@ -73,8 +75,7 @@ display: text: 'Poista {{ name }}' alt: 'Poista {{ name }}' text: Poista - name: - separator: ', ' + name: { } widget: display_title: Widgetti display_options: diff --git a/modules/helfi_media/config/optional/language/sv/views.view.media.yml b/modules/helfi_media/config/optional/language/sv/views.view.media.yml index 1ad05ea49..16c3d9297 100644 --- a/modules/helfi_media/config/optional/language/sv/views.view.media.yml +++ b/modules/helfi_media/config/optional/language/sv/views.view.media.yml @@ -8,25 +8,18 @@ display: action_title: Åtgärd thumbnail__target_id: label: Miniatyr - separator: ', ' name: label: Medianamn - separator: ', ' bundle: label: Typ - separator: ', ' uid: label: Författare - separator: ', ' status: settings: format_custom_false: 'Ej publicerad' format_custom_true: Publicerad - label: Status - separator: ', ' changed: label: Uppdaterad - separator: ', ' operations: label: Funktioner pager: @@ -60,6 +53,7 @@ display: status: expose: label: Sant + description: '' group_info: label: 'Status för publicering' group_items: @@ -70,10 +64,6 @@ display: langcode: expose: label: Språk - title: Media media_page_list: - display_title: Media display_options: - menu: - title: Media -label: Media + menu: { } diff --git a/modules/helfi_media/config/optional/language/sv/views.view.media_library.yml b/modules/helfi_media/config/optional/language/sv/views.view.media_library.yml index 0370700e3..228616346 100644 --- a/modules/helfi_media/config/optional/language/sv/views.view.media_library.yml +++ b/modules/helfi_media/config/optional/language/sv/views.view.media_library.yml @@ -12,9 +12,7 @@ display: items_per_page_label: 'Inlägg per sida' items_per_page_options_all_label: '- Alla -' offset_label: Kompensera - tags: - next: ›› - previous: ‹‹ + tags: { } exposed_form: options: submit_button: 'Tillämpa filter' @@ -39,11 +37,14 @@ display: status: expose: label: 'Status för publicering' + description: '' group_info: label: Publicerad group_items: 1: title: Publicerad + 2: + title: 'Ej publicerad' name: expose: label: Namn @@ -52,10 +53,10 @@ display: label: Mediatyp group_info: label: Mediatyp + description: '' langcode: expose: label: Språk - title: Media page: display_title: Sida display_options: @@ -72,8 +73,7 @@ display: text: 'Radera {{ name }}' alt: 'Radera {{ name }}' text: Radera - name: - separator: ', ' + name: { } widget: display_options: arguments: @@ -89,7 +89,6 @@ display: label: Rutnät display_link_table: label: Tabell - display_title: Widget widget_table: display_title: 'Gränssnittskomponent (tabell)' display_options: @@ -115,4 +114,3 @@ display: label: Rutnät display_link_table: label: Tabell -label: 'Media library' diff --git a/modules/helfi_media/config/rewrite/views.view.media_library.yml b/modules/helfi_media/config/rewrite/views.view.media_library.yml index 9c2dbf339..e24b47b3e 100644 --- a/modules/helfi_media/config/rewrite/views.view.media_library.yml +++ b/modules/helfi_media/config/rewrite/views.view.media_library.yml @@ -1,3 +1,4 @@ +uuid: b6b55098-871d-4163-884a-8c3b305a1960 langcode: en status: true dependencies: @@ -136,6 +137,7 @@ display: type: mini options: offset: 0 + pagination_heading_level: h4 items_per_page: 24 total_pages: null id: 0 @@ -267,11 +269,11 @@ display: default_group: All default_group_multiple: { } group_items: - - + 1: title: Published operator: '=' value: '1' - - + 2: title: Unpublished operator: '=' value: '0' @@ -473,13 +475,13 @@ display: cache_metadata: max-age: 0 contexts: + - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - 'url.query_args:sort_by' - user - user.permissions - - 'languages:language_content' tags: { } page: id: page @@ -1074,6 +1076,7 @@ display: type: full options: offset: 0 + pagination_heading_level: h4 items_per_page: 24 total_pages: null id: 0 diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml index 9e9692fc7..9c3ac00d2 100644 --- a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml +++ b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_errand_service_list.yml @@ -20,31 +20,24 @@ display: expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' - offset_label: Offset fields: tpr_errand_service_bulk_form: label: Massapäivitys action_title: Toiminto name: label: Nimi - separator: ', ' langcode: label: Kieli - separator: ', ' content_translation_status: label: Tila settings: format_custom_true: Julkaistu format_custom_false: Julkaisematon - separator: ', ' content_translation_changed: label: Päivitetty - separator: ', ' operations: label: Toimenpiteet - id: - label: ID - separator: ', ' + id: { } filters: combine: expose: diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml index a6c44197e..9990d2d86 100644 --- a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml +++ b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_channel_list.yml @@ -20,31 +20,24 @@ display: expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' - offset_label: Offset fields: tpr_service_channel_bulk_form: label: Massapäivitys action_title: Toiminto name: label: Nimi - separator: ', ' langcode: label: Kieli - separator: ', ' content_translation_status: label: Tila settings: format_custom_true: Julkaistu format_custom_false: Julkaisematon - separator: ', ' content_translation_changed: label: Päivitetty - separator: ', ' operations: label: Toimenpiteet - id: - label: ID - separator: ', ' + id: { } filters: combine: expose: diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml index cab70f3eb..4742c8bbe 100644 --- a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml +++ b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_service_list.yml @@ -20,31 +20,24 @@ display: expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' - offset_label: Offset fields: tpr_service_bulk_form: label: Massapäivitys action_title: Toiminto name: label: Nimi - separator: ', ' langcode: label: Kieli - separator: ', ' content_translation_status: label: Tila settings: format_custom_true: Julkaistu format_custom_false: Julkaisematon - separator: ', ' content_translation_changed: label: Päivitetty - separator: ', ' operations: label: Toimenpiteet - id: - label: ID - separator: ', ' + id: { } filters: combine: expose: diff --git a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml index d6726e3fd..12d738336 100644 --- a/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml +++ b/modules/helfi_tpr_config/config/optional/language/fi/views.view.tpr_unit_list.yml @@ -20,28 +20,21 @@ display: expose: items_per_page_label: 'Merkintöjä sivua kohti' items_per_page_options_all_label: '- Kaikki -' - offset_label: Offset fields: name: label: Nimi - separator: ', ' langcode: label: Kieli - separator: ', ' content_translation_status: label: Tila settings: format_custom_true: Julkaistu format_custom_false: Julkaisematon - separator: ', ' content_translation_changed: label: Päivitetty - separator: ', ' operations: label: Toimenpiteet - id: - label: ID - separator: ', ' + id: { } filters: combine: expose: diff --git a/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml b/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml index 9ea0cc181..1508a255c 100644 --- a/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml +++ b/modules/helfi_tpr_config/config/optional/language/sv/views.view.tpr_errand_service_list.yml @@ -14,8 +14,6 @@ display: tags: first: '« Första' last: 'Sista »' - previous: ‹‹ - next: ›› expose: items_per_page_label: 'Inlägg per sida' items_per_page_options_all_label: '- Alla -' @@ -26,24 +24,17 @@ display: action_title: Åtgärd name: label: Namn - separator: ', ' langcode: label: Språk - separator: ', ' content_translation_status: settings: format_custom_true: Publicerad format_custom_false: 'Ej publicerad' - label: Status - separator: ', ' content_translation_changed: label: Uppdaterad - separator: ', ' operations: label: Funktioner - id: - label: ID - separator: ', ' + id: { } filters: combine: expose: From 03487cfe719f326085a4000dccb91180bade0aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 27 Jan 2025 10:14:47 +0200 Subject: [PATCH 2/5] Added missing update hooks. --- .../hdbt_admin_tools/hdbt_admin_tools.install | 2 +- .../helfi_base_content.install | 4 ++-- modules/helfi_media/helfi_media.install | 4 ++-- .../helfi_tpr_config/helfi_tpr_config.install | 17 +++++------------ 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/modules/hdbt_admin_tools/hdbt_admin_tools.install b/modules/hdbt_admin_tools/hdbt_admin_tools.install index 54fbab9e7..1ed2e0294 100644 --- a/modules/hdbt_admin_tools/hdbt_admin_tools.install +++ b/modules/hdbt_admin_tools/hdbt_admin_tools.install @@ -107,7 +107,7 @@ function hdbt_admin_tools_update_9005(): void { /** * UHF-11222: Fix issue with publish state translation on content listing view. */ -function hdbt_admin_tools_update_9006(): void { +function hdbt_admin_tools_update_9007(): void { // Re-import 'hdbt_admin_tools' configuration. \Drupal::service('helfi_platform_config.config_update_helper') ->update('hdbt_admin_tools'); diff --git a/modules/helfi_base_content/helfi_base_content.install b/modules/helfi_base_content/helfi_base_content.install index b035d9e01..c59db56d7 100644 --- a/modules/helfi_base_content/helfi_base_content.install +++ b/modules/helfi_base_content/helfi_base_content.install @@ -355,9 +355,9 @@ function helfi_base_content_update_9015(): void { } /** - * UHF-10539: Configure view for redirect module. + * UHF-11222: Fix issue with publish state translation on listing views. */ -function helfi_base_content_update_9016(): void { +function helfi_base_content_update_9017(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_base_content'); } diff --git a/modules/helfi_media/helfi_media.install b/modules/helfi_media/helfi_media.install index a4bf2be27..e1f095787 100644 --- a/modules/helfi_media/helfi_media.install +++ b/modules/helfi_media/helfi_media.install @@ -118,9 +118,9 @@ function helfi_media_update_9013(): void { } /** - * UHF-10555: Remove references to deprecated responsive image styles. + * UHF-11222: Fix issue with publish state translation on listing views. */ -function helfi_media_update_9017(): void { +function helfi_media_update_9018(): void { // Re-import 'helfi_media' configuration. \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_media'); diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install index 5660dee58..b393f2e1e 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.install +++ b/modules/helfi_tpr_config/helfi_tpr_config.install @@ -363,15 +363,6 @@ function helfi_tpr_config_update_9049(): void { ]); } -/** - * UHF-9159: Subgroup field display configs. - */ -function helfi_tpr_config_update_9050(): void { - // Re-import 'helfi_tpr_config' configuration. - \Drupal::service('helfi_platform_config.config_update_helper') - ->update('helfi_tpr_config'); -} - /** * UHF-8936 Update tpr_unit to include map and text paragraphs in lower content. */ @@ -414,8 +405,10 @@ function helfi_tpr_config_update_9074(): void { } /** - * UHF-10352 add TPR-delete permissions. + * UHF-11222: Fix issue with publish state translation on listing views. */ -function helfi_tpr_config_update_9073(): void { - helfi_tpr_config_grant_permissions(); +function helfi_tpr_config_update_9075(): void { + // Re-import 'helfi_tpr_config' configuration. + \Drupal::service('helfi_platform_config.config_update_helper') + ->update('helfi_tpr_config'); } From c380487a1d33c6af05ae77c2caa04291f8a26d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 27 Jan 2025 10:37:38 +0200 Subject: [PATCH 3/5] Apply rewrites on module updates. --- .../config/rewrite/views.view.content.yml | 1 + .../hdbt_admin_tools/hdbt_admin_tools.module | 11 ++++++++++ .../helfi_base_content.module | 12 +++++++++++ .../rewrite/views.view.media_library.yml | 2 +- modules/helfi_media/helfi_media.module | 20 +++++++++++++++++++ .../helfi_tpr_config/helfi_tpr_config.module | 11 ++++++++++ 6 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 modules/helfi_media/helfi_media.module diff --git a/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml b/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml index 0810c3db3..b776823fd 100644 --- a/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml +++ b/modules/hdbt_admin_tools/config/rewrite/views.view.content.yml @@ -1,3 +1,4 @@ +config_rewrite: 'replace' langcode: en status: true dependencies: diff --git a/modules/hdbt_admin_tools/hdbt_admin_tools.module b/modules/hdbt_admin_tools/hdbt_admin_tools.module index 5c1e4a18e..c389d17cb 100644 --- a/modules/hdbt_admin_tools/hdbt_admin_tools.module +++ b/modules/hdbt_admin_tools/hdbt_admin_tools.module @@ -7,6 +7,7 @@ declare(strict_types=1); +use Drupal\config_rewrite\ConfigRewriterInterface; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityForm; use Drupal\Core\Entity\EntityInterface; @@ -23,6 +24,16 @@ use Drupal\helfi_tpr\Entity\Service; use Drupal\node\NodeInterface; use Drupal\user\UserInterface; +/** + * Implements hook_rewrite_config_update(). + */ +function hdbt_admin_tools_config_rewrite_config_update(string $module, ConfigRewriterInterface $configRewriter): void { + // Rewrite module configuration. + if ($module === 'hdbt_admin_tools') { + $configRewriter->rewriteModuleConfig('hdbt_admin_tools'); + } +} + /** * Register routes to apply Gin’s content edit form layout. * diff --git a/modules/helfi_base_content/helfi_base_content.module b/modules/helfi_base_content/helfi_base_content.module index 0a099e376..4390c5a2c 100644 --- a/modules/helfi_base_content/helfi_base_content.module +++ b/modules/helfi_base_content/helfi_base_content.module @@ -7,6 +7,8 @@ declare(strict_types=1); +use Drupal\config_rewrite\ConfigRewriterInterface; + /** * Implements hook_themes_installed(). */ @@ -463,3 +465,13 @@ function helfi_base_content_get_block_configurations(string $theme) : array { ], ]; } + +/** + * Implements hook_rewrite_config_update(). + */ +function helfi_base_content_config_rewrite_config_update(string $module, ConfigRewriterInterface $configRewriter): void { + // Rewrite module configuration. + if ($module === 'helfi_base_content') { + $configRewriter->rewriteModuleConfig('helfi_base_content'); + } +} diff --git a/modules/helfi_media/config/rewrite/views.view.media_library.yml b/modules/helfi_media/config/rewrite/views.view.media_library.yml index e24b47b3e..ce35734e8 100644 --- a/modules/helfi_media/config/rewrite/views.view.media_library.yml +++ b/modules/helfi_media/config/rewrite/views.view.media_library.yml @@ -1,4 +1,4 @@ -uuid: b6b55098-871d-4163-884a-8c3b305a1960 +config_rewrite: 'replace' langcode: en status: true dependencies: diff --git a/modules/helfi_media/helfi_media.module b/modules/helfi_media/helfi_media.module new file mode 100644 index 000000000..e83f528f3 --- /dev/null +++ b/modules/helfi_media/helfi_media.module @@ -0,0 +1,20 @@ +rewriteModuleConfig('helfi_media'); + } +} diff --git a/modules/helfi_tpr_config/helfi_tpr_config.module b/modules/helfi_tpr_config/helfi_tpr_config.module index f1f8d0088..72bff5f14 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.module +++ b/modules/helfi_tpr_config/helfi_tpr_config.module @@ -7,6 +7,7 @@ declare(strict_types=1); +use Drupal\config_rewrite\ConfigRewriterInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Render\Element; @@ -38,6 +39,16 @@ function helfi_tpr_config_entity_bundle_info_alter(array &$bundles): void { } } +/** + * Implements hook_rewrite_config_update(). + */ +function helfi_tpr_config_config_rewrite_config_update(string $module, ConfigRewriterInterface $configRewriter): void { + // Rewrite module configuration. + if ($module === 'helfi_tpr_config') { + $configRewriter->rewriteModuleConfig('helfi_tpr_config'); + } +} + /** * Implements hook_helfi_paragraph_types(). */ From 8835d0b0c3042e19ac6d08ece1374cff002659e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 27 Jan 2025 10:58:59 +0200 Subject: [PATCH 4/5] Allow rewrites on scheduler views. --- ...views.view.scheduler_scheduled_content.yml | 72 ++ ...views.view.scheduler_scheduled_content.yml | 57 + ...views.view.scheduler_scheduled_content.yml | 1142 +++++++++++++++++ 3 files changed, 1271 insertions(+) create mode 100644 modules/helfi_base_content/config/optional/language/fi/views.view.scheduler_scheduled_content.yml create mode 100644 modules/helfi_base_content/config/optional/language/sv/views.view.scheduler_scheduled_content.yml create mode 100644 modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml diff --git a/modules/helfi_base_content/config/optional/language/fi/views.view.scheduler_scheduled_content.yml b/modules/helfi_base_content/config/optional/language/fi/views.view.scheduler_scheduled_content.yml new file mode 100644 index 000000000..4aba85cd2 --- /dev/null +++ b/modules/helfi_base_content/config/optional/language/fi/views.view.scheduler_scheduled_content.yml @@ -0,0 +1,72 @@ +label: 'Ajastettu sisältö' +description: 'Etsi ja ylläpidä ajastettua sisältöä.' +display: + default: + display_options: + fields: + node_bulk_form: + action_title: Toiminto + title: + label: Otsikko + type: + label: Sisältötyyppi + name: + label: Kirjoittaja + status: + label: Tila + settings: + format_custom_true: Julkaistu + format_custom_false: Julkaisematon + publish_on: + label: Julkaisuaika + unpublish_on: + label: 'Ajastettu piilottaminen' + operations: + label: Toimenpiteet + filters: + title: + expose: + label: Otsikko + type: + expose: + label: Sisältötyyppi + status: + expose: + label: Tila + group_info: + label: Julkaisutila + group_items: + 1: + title: Julkaistu + 2: + title: Julkaisematon + langcode: + expose: + label: Kieli + title: 'Ajastettu sisältö' + empty: + area_text_custom: + content: 'Ei vielä ajastettua sisältöä.' + display_title: Oletus + overview: + display_options: + menu: + title: Ajastettu + tab_options: + title: Sisältö + display_description: 'Yleiskatsaus koko ajoitetusta sisällöstä.' + display_title: Sisältö + user_page: + display_options: + menu: + title: Ajastettu + tab_options: + title: Sisältö + arguments: + uid: + exception: + title: Kaikki + empty: + area_text_custom: + content: '{{ arguments.uid }} käyttäjä ei ole ajastanut sisältöä.' + display_title: Käyttäjäprofiili diff --git a/modules/helfi_base_content/config/optional/language/sv/views.view.scheduler_scheduled_content.yml b/modules/helfi_base_content/config/optional/language/sv/views.view.scheduler_scheduled_content.yml new file mode 100644 index 000000000..57626dd7f --- /dev/null +++ b/modules/helfi_base_content/config/optional/language/sv/views.view.scheduler_scheduled_content.yml @@ -0,0 +1,57 @@ +display: + default: + display_options: + fields: + node_bulk_form: + action_title: Åtgärd + title: + label: Titel + type: + label: Innehållstyp + name: + label: Författare + status: + settings: + format_custom_true: Publicerad + format_custom_false: 'Ej publicerad' + publish_on: + label: 'Publicera den' + unpublish_on: + label: 'Avpublicera den' + operations: + label: Funktioner + filters: + title: + expose: + label: Titel + type: + expose: + label: Innehållstyp + status: + group_info: + label: 'Status för publicering' + group_items: + 1: + title: Publicerad + 2: + title: 'Ej publicerad' + langcode: + expose: + label: Språk + display_title: Förvald + overview: + display_options: + menu: + title: Schemalagd + tab_options: + title: Innehåll + user_page: + display_options: + menu: + title: Schemalagd + tab_options: + title: Innehåll + arguments: + uid: + exception: + title: Alla diff --git a/modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml b/modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml new file mode 100644 index 000000000..f9f416a54 --- /dev/null +++ b/modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml @@ -0,0 +1,1142 @@ +config_rewrite: 'replace' +langcode: en +status: true +dependencies: + config: + - system.menu.admin + module: + - node + - scheduler + - user +id: scheduler_scheduled_content +label: 'Scheduled content' +module: views +description: 'Find and manage scheduled content.' +tag: '' +base_table: node_field_revision +base_field: vid +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: 'Scheduled Content' + fields: + node_bulk_form: + id: node_bulk_form + table: node + field: node_bulk_form + relationship: nid + group_type: group + admin_label: '' + entity_type: node + plugin_id: node_bulk_form + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + action_title: Action + include_exclude: exclude + selected_actions: { } + title: + id: title + table: node_field_revision + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: field + label: Title + exclude: false + alter: + alter_text: false + make_link: false + absolute: false + word_boundary: false + ellipsis: false + strip_tags: false + trim: false + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + type: + id: type + table: node_field_data + field: type + relationship: nid + group_type: group + admin_label: '' + entity_type: node + entity_field: type + plugin_id: field + label: 'Content Type' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: target_id + type: entity_reference_label + settings: + link: false + group_column: target_id + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + name: + id: name + table: users_field_data + field: name + relationship: revision_uid + group_type: group + admin_label: '' + entity_type: user + entity_field: name + plugin_id: field + label: Author + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: user_name + settings: + link_to_entity: true + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + status: + id: status + table: node_field_revision + field: status + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: status + plugin_id: field + label: Status + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: boolean + settings: + format: custom + format_custom_false: Unpublished + format_custom_true: Published + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + publish_on: + id: publish_on + table: node_field_revision + field: publish_on + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: publish_on + plugin_id: field + label: 'Publish on' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: short + custom_date_format: '' + timezone: '' + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + unpublish_on: + id: unpublish_on + table: node_field_revision + field: unpublish_on + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: unpublish_on + plugin_id: field + label: 'Unpublish on' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: timestamp + settings: + date_format: short + custom_date_format: '' + timezone: '' + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + operations: + id: operations + table: node_revision + field: operations + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: entity_operations + label: Operations + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: true + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + destination: true + pager: + type: full + options: + offset: 0 + pagination_heading_level: h4 + items_per_page: 50 + total_pages: null + id: 0 + tags: + next: 'next ›' + previous: '‹ previous' + first: '« first' + last: 'last »' + exposed_form: + type: basic + options: + submit_button: Filter + reset_button: true + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + access: + type: scheduler + cache: + type: tag + options: { } + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No scheduled content.' + tokenize: false + sorts: { } + arguments: { } + filters: + latest_revision: + id: latest_revision + table: node_revision + field: latest_revision + relationship: none + group_type: group + admin_label: '' + entity_type: node + plugin_id: latest_revision + operator: '=' + value: '' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + anonymous: '0' + authenticated: '0' + administrator: '0' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + title: + id: title + table: node_field_revision + field: title + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: title + plugin_id: string + operator: contains + value: '' + group: 1 + exposed: true + expose: + operator_id: title_op + label: Title + description: '' + use_operator: false + operator: title_op + operator_limit_selection: false + operator_list: { } + identifier: title + required: false + remember: false + multiple: false + remember_roles: + anonymous: '0' + authenticated: '0' + administrator: '0' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + type: + id: type + table: node_field_data + field: type + relationship: nid + group_type: group + admin_label: '' + entity_type: node + entity_field: type + plugin_id: bundle + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: type_op + label: 'Content type' + description: '' + use_operator: false + operator: type_op + operator_limit_selection: false + operator_list: { } + identifier: type + required: false + remember: false + multiple: false + remember_roles: + anonymous: '0' + authenticated: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + status: + id: status + table: node_field_revision + field: status + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: status + plugin_id: boolean + operator: '=' + value: '' + group: 1 + exposed: true + expose: + operator_id: '' + label: Status + description: '' + use_operator: false + operator: status_op + operator_limit_selection: false + operator_list: { } + identifier: status + required: false + remember: false + multiple: false + remember_roles: + authenticated: '0' + anonymous: '0' + administrator: '0' + is_grouped: true + group_info: + label: 'Published status' + description: '' + identifier: status + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: + 1: + title: Published + operator: '=' + value: '1' + 2: + title: Unpublished + operator: '=' + value: '0' + langcode: + id: langcode + table: node_field_revision + field: langcode + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: langcode + plugin_id: language + operator: in + value: { } + group: 1 + exposed: true + expose: + operator_id: langcode_op + label: Language + description: '' + use_operator: false + operator: langcode_op + operator_limit_selection: false + operator_list: { } + identifier: langcode + required: false + remember: false + multiple: false + remember_roles: + anonymous: '0' + authenticated: '0' + administrator: '0' + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + publish_on: + id: publish_on + table: node_field_revision + field: publish_on + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: publish_on + plugin_id: date + operator: 'not empty' + value: + min: '' + max: '' + value: '' + type: date + group: 2 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + anonymous: '0' + authenticated: '0' + administrator: '0' + min_placeholder: '' + max_placeholder: '' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + unpublish_on: + id: unpublish_on + table: node_field_revision + field: unpublish_on + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: unpublish_on + plugin_id: date + operator: 'not empty' + value: + min: '' + max: '' + value: '' + type: date + group: 2 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + anonymous: '0' + authenticated: '0' + administrator: '0' + min_placeholder: '' + max_placeholder: '' + placeholder: '' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + filter_groups: + operator: AND + groups: + 1: AND + 2: OR + style: + type: table + options: + grouping: { } + row_class: '' + default_row_class: true + columns: + node_bulk_form: node_bulk_form + title: title + type: type + name: name + status: status + publish_on: publish_on + unpublish_on: unpublish_on + operations: operations + default: '-1' + info: + node_bulk_form: + align: '' + separator: '' + empty_column: false + responsive: '' + title: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + name: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + status: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + publish_on: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + unpublish_on: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + operations: + align: '' + separator: '' + empty_column: false + responsive: '' + override: true + sticky: true + summary: '' + empty_table: true + caption: '' + description: '' + row: + type: fields + query: + type: views_query + options: + query_comment: '' + disable_sql_rewrite: false + distinct: false + replica: false + query_tags: { } + relationships: + nid: + id: nid + table: node_field_revision + field: nid + relationship: none + group_type: group + admin_label: 'node id' + entity_type: node + entity_field: nid + plugin_id: standard + required: false + revision_uid: + id: revision_uid + table: node_revision + field: revision_uid + relationship: none + group_type: group + admin_label: 'revision user id' + entity_type: node + entity_field: revision_uid + plugin_id: standard + required: false + header: { } + footer: { } + display_extenders: { } + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user + - 'user.node_grants:view' + tags: { } + overview: + id: overview + display_title: 'Content Overview' + display_plugin: page + position: 1 + display_options: + display_description: "Overview of all scheduled content, as a tab on main 'content admin' page" + display_comment: "Revision nid relationship is required because the content type is only stored at 'content' level, not 'content revision' level." + display_extenders: { } + path: admin/content/scheduled + menu: + type: normal + title: Scheduled + description: 'Content scheduled for publishing and unpublishing' + weight: -10 + expanded: false + menu_name: admin + parent: system.admin_content + context: '0' + tab_options: + type: normal + title: Content + description: 'Find and manage scheduled content' + weight: -10 + menu_name: admin + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user + - 'user.node_grants:view' + tags: { } + user_page: + id: user_page + display_title: 'User profile tab' + display_plugin: page + position: 2 + display_options: + empty: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'No scheduled content for user {{ arguments.uid }}' + tokenize: true + arguments: + uid: + id: uid + table: node_field_revision + field: uid + relationship: none + group_type: group + admin_label: '' + entity_type: node + entity_field: uid + plugin_id: entity_target_id + default_action: empty + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: fixed + default_argument_options: + argument: '' + summary_options: + base_path: '' + count: true + override: false + items_per_page: 25 + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: true + validate: + type: 'entity:user' + fail: 'not found' + validate_options: + access: false + operation: view + multiple: 0 + restrict_roles: false + roles: { } + break_phrase: false + not: false + target_entity_type_id: user + defaults: + empty: false + access: true + arguments: false + filters: true + filter_groups: true + display_description: "Scheduled content tab on user profile, showing just that user's scheduled content" + display_extenders: { } + path: user/%user/scheduled + menu: + type: tab + title: Scheduled + description: '' + weight: -10 + menu_name: admin + parent: system.admin_content + context: '0' + tab_options: + type: normal + title: Content + description: 'Find and manage scheduled content' + weight: -10 + menu_name: admin + cache_metadata: + max-age: 0 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user + - 'user.node_grants:view' + tags: { } From 9206806f47ad92d450f15699d546bdd3e6e2ebfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 27 Jan 2025 11:06:41 +0200 Subject: [PATCH 5/5] Removed dependency. --- .../config/rewrite/views.view.scheduler_scheduled_content.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml b/modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml index f9f416a54..a29ab9088 100644 --- a/modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml +++ b/modules/helfi_base_content/config/rewrite/views.view.scheduler_scheduled_content.yml @@ -2,8 +2,6 @@ config_rewrite: 'replace' langcode: en status: true dependencies: - config: - - system.menu.admin module: - node - scheduler