From 37c22cb6466138eea0e46714483c019ad007c861 Mon Sep 17 00:00:00 2001 From: Teemu Erkkola Date: Tue, 10 Oct 2023 09:39:16 +0300 Subject: [PATCH 01/12] AV-2060: Update translation files --- ckan/ckanext/ckanext-ytp_comments/.tx/config | 4 +- .../i18n/ckanext-ytp_comments.pot | 82 +++++++++---------- .../ckanext/ytp/i18n/ckanext-ytp_main.pot | 18 ++-- .../i18n/fi/LC_MESSAGES/ckanext-ytp_main.po | 38 ++++----- .../i18n/sv/LC_MESSAGES/ckanext-ytp_main.po | 28 +++---- 5 files changed, 85 insertions(+), 85 deletions(-) diff --git a/ckan/ckanext/ckanext-ytp_comments/.tx/config b/ckan/ckanext/ckanext-ytp_comments/.tx/config index 74199f06f5..9e75205679 100644 --- a/ckan/ckanext/ckanext-ytp_comments/.tx/config +++ b/ckan/ckanext/ckanext-ytp_comments/.tx/config @@ -2,8 +2,8 @@ host = https://www.transifex.com [o:avoindata:p:ytp:r:ckanext-ytp-comments] -file_filter = i18n//LC_MESSAGES/ckanext-ytp-comments.po -source_file = i18n/ckanext-ytp-comments.pot +file_filter = ckanext/ytp_comments/i18n//LC_MESSAGES/ckanext-ytp-comments.po +source_file = ckanext/ytp_comments/i18n/ckanext-ytp_comments.pot source_lang = en type = PO diff --git a/ckan/ckanext/ckanext-ytp_comments/ckanext/ytp_comments/i18n/ckanext-ytp_comments.pot b/ckan/ckanext/ckanext-ytp_comments/ckanext/ytp_comments/i18n/ckanext-ytp_comments.pot index 47afd0c3fd..6da3801caa 100644 --- a/ckan/ckanext/ckanext-ytp_comments/ckanext/ytp_comments/i18n/ckanext-ytp_comments.pot +++ b/ckan/ckanext/ckanext-ytp_comments/ckanext/ytp_comments/i18n/ckanext-ytp_comments.pot @@ -1,28 +1,28 @@ -# Translations template for ckanext-ytp-comments. -# Copyright (C) 2015 ORGANIZATION -# This file is distributed under the same license as the ckanext-ytp-comments +# Translations template for ckanext-ytp_comments. +# Copyright (C) 2023 ORGANIZATION +# This file is distributed under the same license as the ckanext-ytp_comments # project. -# FIRST AUTHOR , 2015. +# FIRST AUTHOR , 2023. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ckanext-ytp-comments 0.0\n" +"Project-Id-Version: ckanext-ytp_comments 0.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2015-11-09 15:34+0200\n" +"POT-Creation-Date: 2023-10-09 08:55+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 2.7.0\n" -#: ckanext/ytp/comments/email_template.py:7 +#: ckanext/ytp_comments/email_template.py:7 msgid "New comment in dataset '{dataset}'" msgstr "" -#: ckanext/ytp/comments/email_template.py:9 +#: ckanext/ytp_comments/email_template.py:9 msgid "" "User {user} ({email}) has left a comment in dataset ({dataset}):\n" "\n" @@ -38,91 +38,91 @@ msgid "" "\n" "Best regards\n" "\n" -"Avoindata.fi support\n" -"avoindata@vrk.fi\n" +"Suomi.fi Open Data support\n" +"avoindata@dvv.fi\n" msgstr "" -#: ckanext/ytp/comments/logic/auth/create.py:15 -#: ckanext/ytp/comments/logic/auth/update.py:17 +#: ckanext/ytp_comments/logic/auth/create.py:15 +#: ckanext/ytp_comments/logic/auth/update.py:17 msgid "You must be logged in to add a comment" msgstr "" -#: ckanext/ytp/comments/logic/auth/create.py:27 +#: ckanext/ytp_comments/logic/auth/create.py:27 msgid "You must be logged in to subscribe to comment notifications" msgstr "" -#: ckanext/ytp/comments/logic/auth/delete.py:25 -#: ckanext/ytp/comments/logic/auth/update.py:23 +#: ckanext/ytp_comments/logic/auth/delete.py:25 +#: ckanext/ytp_comments/logic/auth/update.py:23 msgid "Comment does not exist" msgstr "" -#: ckanext/ytp/comments/logic/auth/delete.py:28 -#: ckanext/ytp/comments/logic/auth/update.py:26 +#: ckanext/ytp_comments/logic/auth/delete.py:28 +#: ckanext/ytp_comments/logic/auth/update.py:26 msgid "User is not the author of the comment" msgstr "" -#: ckanext/ytp/comments/logic/auth/delete.py:40 +#: ckanext/ytp_comments/logic/auth/delete.py:40 msgid "You must be logged in to unsubscribe from comment notifications" msgstr "" -#: ckanext/ytp/comments/public/javascript/notifications.js:9 -#: ckanext/ytp/comments/templates/organization/read.html:19 -#: ckanext/ytp/comments/templates/package/comment_list.html:100 +#: ckanext/ytp_comments/public/javascript/notifications.js:9 +#: ckanext/ytp_comments/templates/organization/read.html:19 +#: ckanext/ytp_comments/templates/package/comment_list.html:99 msgid "Subscribe to comments" msgstr "" -#: ckanext/ytp/comments/public/javascript/notifications.js:10 -#: ckanext/ytp/comments/templates/organization/read.html:15 -#: ckanext/ytp/comments/templates/package/comment_list.html:98 +#: ckanext/ytp_comments/public/javascript/notifications.js:10 +#: ckanext/ytp_comments/templates/organization/read.html:15 +#: ckanext/ytp_comments/templates/package/comment_list.html:97 msgid "Unsubscribe from comments" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:10 -#: ckanext/ytp/comments/templates/package/comment_list.html:86 +#: ckanext/ytp_comments/templates/package/comment_list.html:10 +#: ckanext/ytp_comments/templates/package/comment_list.html:85 msgid "Subject" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:12 -#: ckanext/ytp/comments/templates/package/comment_list.html:89 +#: ckanext/ytp_comments/templates/package/comment_list.html:12 +#: ckanext/ytp_comments/templates/package/comment_list.html:88 msgid "Comment" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:17 -#: ckanext/ytp/comments/templates/package/comment_list.html:93 +#: ckanext/ytp_comments/templates/package/comment_list.html:17 +#: ckanext/ytp_comments/templates/package/comment_list.html:92 msgid "Save" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:18 -#: ckanext/ytp/comments/templates/package/comment_list.html:94 +#: ckanext/ytp_comments/templates/package/comment_list.html:18 +#: ckanext/ytp_comments/templates/package/comment_list.html:93 msgid "Clear" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:37 -#: ckanext/ytp/comments/templates/package/comment_list.html:49 +#: ckanext/ytp_comments/templates/package/comment_list.html:36 +#: ckanext/ytp_comments/templates/package/comment_list.html:48 msgid "This comment was deleted." msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:42 +#: ckanext/ytp_comments/templates/package/comment_list.html:41 msgid "Modified" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:54 +#: ckanext/ytp_comments/templates/package/comment_list.html:53 msgid "Delete" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:58 +#: ckanext/ytp_comments/templates/package/comment_list.html:57 msgid "Edit" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:62 +#: ckanext/ytp_comments/templates/package/comment_list.html:61 msgid "Reply" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:76 +#: ckanext/ytp_comments/templates/package/comment_list.html:75 msgid "Comments" msgstr "" -#: ckanext/ytp/comments/templates/package/comment_list.html:107 +#: ckanext/ytp_comments/templates/package/comment_list.html:106 msgid "Login to comment." msgstr "" diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/ckanext-ytp_main.pot b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/ckanext-ytp_main.pot index e2bc854e5e..3bec119c46 100644 --- a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/ckanext-ytp_main.pot +++ b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/ckanext-ytp_main.pot @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-ytp_main 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-08-08 07:15+0000\n" +"POT-Creation-Date: 2023-10-09 07:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2965,10 +2965,10 @@ msgstr "" #: ckanext/ytp/templates/report/administrative_branch_summary_report.html:81 msgid "" -"Dataset counts are based on submission statistics from avoindata.fi. Open " -"data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 " -"for evaluating open data. More information on the metric is available at http://5stardata.info." +"Dataset counts are based on submission statistics from Suomi.fi Open Data. " +"Open data quality rating is based on a metricdevised by Tim Berners-Lee in " +"2010 for evaluating open data. More information on the metric is available at" +" http://5stardata.info." msgstr "" #: ckanext/ytp/templates/report/deprecated_dataset_report.html:9 @@ -3498,10 +3498,10 @@ msgstr "" #: ckanext/ytp/templates/sparql/query.html:18 msgid "" "You can use the SPARQL search to find datasets and their metadata by using " -"SPARQL query language. Datasets on opendata.fi are published as RDF triples " -"and they follow the DCAT-AP specification. You can find information on opendata.fi’s DCAT AP extension " -"here." +"SPARQL query language. Datasets on Suomi.fi Open Data are published as RDF " +"triples and they follow the DCAT-AP specification. You can find information " +"on Suomi.fi Open Data’s DCAT AP " +"extension here." msgstr "" #: ckanext/ytp/templates/sparql/query.html:22 diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/fi/LC_MESSAGES/ckanext-ytp_main.po b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/fi/LC_MESSAGES/ckanext-ytp_main.po index 174518ff73..0b1beeaa25 100644 --- a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/fi/LC_MESSAGES/ckanext-ytp_main.po +++ b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/fi/LC_MESSAGES/ckanext-ytp_main.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-ytp_main 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-08-08 07:15+0000\n" +"POT-Creation-Date: 2023-10-09 07:14+0000\n" "PO-Revision-Date: 2018-03-08 13:35+0000\n" "Last-Translator: Teemu Erkkola , 2023\n" "Language-Team: Finnish (https://app.transifex.com/avoindata/teams/7979/fi/)\n" @@ -3127,15 +3127,15 @@ msgstr "Viim. 6kk" #: ckanext/ytp/templates/report/administrative_branch_summary_report.html:81 msgid "" -"Dataset counts are based on submission statistics from avoindata.fi. Open " -"data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 " -"for evaluating open data. More information on the metric is available at http://5stardata.info." +"Dataset counts are based on submission statistics from Suomi.fi Open Data. " +"Open data quality rating is based on a metricdevised by Tim Berners-Lee in " +"2010 for evaluating open data. More information on the metric is available " +"at http://5stardata.info." msgstr "" -"Tietoaineistot on laskettu avoindata.fi-palvelusta löytyvien " -"tietoaineistojen mukaan. Avoimen datan laatupisteitys perustuu Tim Berners-" -"Leen vuonna 2010 kehittämään avoimen datan luokitteluun. Tästä on saatavissa" -" lisätietoja esimerkiksi verkko-osoitteesta http://5stardata.info." #: ckanext/ytp/templates/report/deprecated_dataset_report.html:9 @@ -3709,16 +3709,16 @@ msgstr "SPARQL-haku" #: ckanext/ytp/templates/sparql/query.html:18 msgid "" "You can use the SPARQL search to find datasets and their metadata by using " -"SPARQL query language. Datasets on opendata.fi are published as RDF triples " -"and they follow the DCAT-AP specification. You can find information on opendata.fi’s DCAT AP extension " -"here." -msgstr "" -"SPARQL-haulla voit hakea avoindata.fi:n aineistoja ja aineistojen " -"kuvailutietoja käyttämällä SPARQL-kyselykieltä. Kaikki avoindata.fi:n data " -"on kuvailtu RDF-tietomallin ja DCAT-AP-määrittelyn mukaan. Tutustu Avoindata.fi:n DCAT-AP-laajennoksen " -"tietoihin." +"SPARQL query language. Datasets on Suomi.fi Open Data are published as RDF " +"triples and they follow the DCAT-AP specification. You can find information " +"on Suomi.fi Open Data’s DCAT AP " +"extension here." +msgstr "" +"SPARQL-haulla voit hakea Suomi.fi-avoindatan aineistoja ja aineistojen " +"kuvailutietoja käyttämällä SPARQL-kyselykieltä. Kaikki Suomi.fi-avoindatan " +"data on kuvailtu RDF-tietomallin ja DCAT-AP-määrittelyn mukaan. Tutustu Suomi.fi-avoindatan DCAT-AP-" +"laajennoksen tietoihin." #: ckanext/ytp/templates/sparql/query.html:22 msgid "" diff --git a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/sv/LC_MESSAGES/ckanext-ytp_main.po b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/sv/LC_MESSAGES/ckanext-ytp_main.po index 2e44976516..ab4bc83958 100644 --- a/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/sv/LC_MESSAGES/ckanext-ytp_main.po +++ b/ckan/ckanext/ckanext-ytp_main/ckanext/ytp/i18n/sv/LC_MESSAGES/ckanext-ytp_main.po @@ -10,8 +10,8 @@ # Daniel Vainio, 2021 # Ville Teräväinen, 2022 # Zharktas , 2023 -# Roosa Lampinen, 2023 # Suvi Nuttunen, 2023 +# Roosa Lampinen, 2023 # Teemu Erkkola , 2023 # #, fuzzy @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-ytp_main 0.3\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2023-08-08 07:15+0000\n" +"POT-Creation-Date: 2023-10-09 07:14+0000\n" "PO-Revision-Date: 2018-03-08 13:35+0000\n" "Last-Translator: Teemu Erkkola , 2023\n" "Language-Team: Swedish (https://app.transifex.com/avoindata/teams/7979/sv/)\n" @@ -661,7 +661,7 @@ msgstr "Medlemmarna kan endast redigera sina egna datamängder" #: ckanext/ytp/translations.py:76 msgid "Home page" -msgstr "Startsida" +msgstr "Framsida" #: ckanext/ytp/translations.py:77 msgid "Maturity" @@ -2670,7 +2670,7 @@ msgstr "Status" #: ckanext/ytp/templates/package/snippets/additional_info.html:60 msgid "Last Updated" -msgstr "Senast uppdaterat" +msgstr "Senast uppdaterad" #: ckanext/ytp/templates/package/snippets/categories.html:26 msgid "Show more categories" @@ -3064,12 +3064,12 @@ msgstr "Senaste 6 mån." #: ckanext/ytp/templates/report/administrative_branch_summary_report.html:81 msgid "" -"Dataset counts are based on submission statistics from avoindata.fi. Open " -"data quality rating is based on a metricdevised by Tim Berners-Lee in 2010 " -"for evaluating open data. More information on the metric is available at http://5stardata.info." +"Dataset counts are based on submission statistics from Suomi.fi Open Data. " +"Open data quality rating is based on a metricdevised by Tim Berners-Lee in " +"2010 for evaluating open data. More information on the metric is available " +"at http://5stardata.info." msgstr "" -"Datamängderna har räknats utifrån datamängderna i avoindata.fi. " +"Datamängderna har räknats utifrån datamängderna i Suomi.fi-öppnadata. " "Poängsättningen av öppna data baserar sig på en kvalitetsklassificering " "utvecklad av Tim Berners-Lee 2010. Mer information finns till exempel på http://5stardata.info." @@ -3446,7 +3446,7 @@ msgstr "Sökresultaten innehåller inga fält med {facet_type}" #: ckanext/ytp/templates/snippets/home_breadcrumb_item.html:2 msgid "Home" -msgstr "Startsida" +msgstr "Framsida" #: ckanext/ytp/templates/snippets/license.html:14 msgid "No License Provided" @@ -3621,10 +3621,10 @@ msgstr "SPARQL sökning" #: ckanext/ytp/templates/sparql/query.html:18 msgid "" "You can use the SPARQL search to find datasets and their metadata by using " -"SPARQL query language. Datasets on opendata.fi are published as RDF triples " -"and they follow the DCAT-AP specification. You can find information on opendata.fi’s DCAT AP extension " -"here." +"SPARQL query language. Datasets on Suomi.fi Open Data are published as RDF " +"triples and they follow the DCAT-AP specification. You can find information " +"on Suomi.fi Open Data’s DCAT AP " +"extension here." msgstr "" #: ckanext/ytp/templates/sparql/query.html:22 From 6963e5f695203c005f3c813b994760280ae1116a Mon Sep 17 00:00:00 2001 From: Teemu Erkkola Date: Tue, 10 Oct 2023 09:43:02 +0300 Subject: [PATCH 02/12] AV-2060: Update dcat-ap namespace model to refer to Suomi.fi Open Data --- doc/dcat-ap/model.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/dcat-ap/model.yml b/doc/dcat-ap/model.yml index 1ed0ebce07..c72db53f75 100644 --- a/doc/dcat-ap/model.yml +++ b/doc/dcat-ap/model.yml @@ -683,7 +683,7 @@ classes: - name: DataUserInterface term: adfi:DataUserInterface range: rdfs:Literal - description: The showcase’s URL on opendata.fi. The URL is created automatically based on the publisher’s name. You can edit the URL if you want. + description: The showcase’s URL on Suomi.fi Open Data. The URL is created automatically based on the publisher’s name. You can edit the URL if you want. min: 1 max: 1 recommended: From 5c5cb85d9cb40835151adaebc8a0ad43c73c9516 Mon Sep 17 00:00:00 2001 From: Teemu Erkkola Date: Wed, 11 Oct 2023 09:02:19 +0300 Subject: [PATCH 03/12] Fix translation in test --- cypress/e2e/dataset_resource_spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/dataset_resource_spec.js b/cypress/e2e/dataset_resource_spec.js index 9a8d3fb8d1..169b6430a6 100644 --- a/cypress/e2e/dataset_resource_spec.js +++ b/cypress/e2e/dataset_resource_spec.js @@ -209,7 +209,7 @@ describe('Dataset resource tests', function(){ const dataset_data = "test data"; cy.switch_language('sv'); //breadcrumbs - cy.get('.breadcrumb').find('li').eq(0).contains('Startsida'); + cy.get('.breadcrumb').find('li').eq(0).contains('Framsida'); cy.get('.breadcrumb').find('li').eq(1).contains('Producenter'); cy.get('.breadcrumb').find('li').eq(2);//this has autogenerated uid in it cy.get('.breadcrumb').find('li').eq(3).contains(dataset_name); From c4d61f5e836f2a1897e24e771fe7d49844002893 Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 12:30:52 +0300 Subject: [PATCH 04/12] AV-2055: Delete article content type --- drupal/scripts/init_drupal.sh | 11 +++++++++++ drupal/site_config/user.role.publisher.yml | 6 ------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drupal/scripts/init_drupal.sh b/drupal/scripts/init_drupal.sh index c704e94f3d..808f79b77e 100644 --- a/drupal/scripts/init_drupal.sh +++ b/drupal/scripts/init_drupal.sh @@ -90,6 +90,17 @@ drush config:delete field.storage.node.field_basic_page_comments drush config:delete user.role.editor || true drush config:delete system.action.user_add_role_action.editor || true drush config:delete system.action.user_remove_role_action.editor || true +drush config:delete node.type.article || true +drush config:delete core.entity_form_display.node.article.default || true +drush config:delete core.entity_view_display.node.article.default || true +drush config:delete core.entity_view_display.node.article.rss || true +drush config:delete core.entity_view_display.node.article.search_index || true +drush config:delete core.entity_view_display.node.article.search_result || true +drush config:delete core.entity_view_display.node.article.teaser || true +drush config:delete field.field.node.article.body || true +drush config:delete field.field.node.article.comment || true +drush config:delete field.field.node.article.field_image || true +drush config:delete field.field.node.article.field_tags || true diff --git a/drupal/site_config/user.role.publisher.yml b/drupal/site_config/user.role.publisher.yml index a83e122cb1..2ec66c8508 100644 --- a/drupal/site_config/user.role.publisher.yml +++ b/drupal/site_config/user.role.publisher.yml @@ -34,27 +34,23 @@ permissions: - 'create terms in tags' - 'create url aliases' - 'customize shortcut links' - - 'delete any article content' - 'delete any avoindata_article content' - 'delete any avoindata_event content' - 'delete any avoindata_guide_page content' - 'delete any avoindata_servicemessage content' - 'delete any page content' - 'delete content translations' - - 'delete own article content' - 'delete own avoindata_article content' - 'delete own avoindata_event content' - 'delete own avoindata_guide_page content' - 'delete own avoindata_servicemessage content' - 'delete own page content' - 'delete terms in tags' - - 'edit any article content' - 'edit any avoindata_article content' - 'edit any avoindata_event content' - 'edit any avoindata_guide_page content' - 'edit any avoindata_servicemessage content' - 'edit any page content' - - 'edit own article content' - 'edit own avoindata_article content' - 'edit own avoindata_event content' - 'edit own avoindata_guide_page content' @@ -71,8 +67,6 @@ permissions: - 'use text format full_html' - 'use text format ckeditor5' - 'use text format restricted_html' - - 'view article revisions' - - 'view article unpublished content' - 'view avoindata_article revisions' - 'view avoindata_article unpublished content' - 'view avoindata_event revisions' From b4b70fd2159fe87ee917c6c94359604fe41b37a5 Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 12:45:23 +0300 Subject: [PATCH 05/12] AV-2055: Cleanup content_editor, which might end up in environment --- drupal/scripts/init_drupal.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drupal/scripts/init_drupal.sh b/drupal/scripts/init_drupal.sh index 808f79b77e..72c307ed32 100644 --- a/drupal/scripts/init_drupal.sh +++ b/drupal/scripts/init_drupal.sh @@ -101,6 +101,9 @@ drush config:delete field.field.node.article.body drush config:delete field.field.node.article.comment || true drush config:delete field.field.node.article.field_image || true drush config:delete field.field.node.article.field_tags || true +drush config:delete user.role.content_editor || true +drush config:delete system.action.user_add_role_action.content_editor || true +drush config:delete system.action.user_remove_role_action.content_editor || true From 5b904a436a240cce8ebfc8107426b6b3a8cbd329 Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 12:56:35 +0300 Subject: [PATCH 06/12] AV-2055: Delete editor roles from password policy --- ...d_policy.password_policy.minimum_password_requirements.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drupal/site_config/password_policy.password_policy.minimum_password_requirements.yml b/drupal/site_config/password_policy.password_policy.minimum_password_requirements.yml index f7c9abf1cc..8f51af8a8d 100644 --- a/drupal/site_config/password_policy.password_policy.minimum_password_requirements.yml +++ b/drupal/site_config/password_policy.password_policy.minimum_password_requirements.yml @@ -19,7 +19,5 @@ policy_constraints: roles: authenticated: authenticated administrator: administrator - content_editor: content_editor - editor: editor ckan_admin: ckan_admin - publisher: publisher \ No newline at end of file + publisher: publisher From 1ef547b8253d969f083f3efd15b27bb7e878ab9c Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 12:58:20 +0300 Subject: [PATCH 07/12] AV-2055: Delete invalid ckeditor permission --- drupal/site_config/user.role.publisher.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/drupal/site_config/user.role.publisher.yml b/drupal/site_config/user.role.publisher.yml index 2ec66c8508..2fbd8bd5b5 100644 --- a/drupal/site_config/user.role.publisher.yml +++ b/drupal/site_config/user.role.publisher.yml @@ -65,7 +65,6 @@ permissions: - 'update content translations' - 'use text format basic_html' - 'use text format full_html' - - 'use text format ckeditor5' - 'use text format restricted_html' - 'view avoindata_article revisions' - 'view avoindata_article unpublished content' From 9e788d9bef7bff992283c961aad4fdd551083c9a Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 14:27:45 +0300 Subject: [PATCH 08/12] AV-2055: delete datasetlist and appfeed modules which were unused --- drupal/modules/avoindata-appfeed/README.md | 3 - .../avoindata_appfeed.info.yml | 6 - .../avoindata_appfeed.module | 132 -------------- .../src/Plugin/Block/AppFeedBlock.php | 37 ---- .../avoindata_appfeed_block.html.twig | 31 ---- .../modules/avoindata-datasetlist/README.md | 3 - .../avoindata_datasetlist.info.yml | 6 - .../avoindata_datasetlist.module | 166 ------------------ .../src/Plugin/Block/DatasetlistBlock.php | 56 ------ .../avoindata_datasetlist_block.html.twig | 113 ------------ 10 files changed, 553 deletions(-) delete mode 100644 drupal/modules/avoindata-appfeed/README.md delete mode 100644 drupal/modules/avoindata-appfeed/avoindata_appfeed.info.yml delete mode 100644 drupal/modules/avoindata-appfeed/avoindata_appfeed.module delete mode 100644 drupal/modules/avoindata-appfeed/src/Plugin/Block/AppFeedBlock.php delete mode 100644 drupal/modules/avoindata-appfeed/templates/avoindata_appfeed_block.html.twig delete mode 100644 drupal/modules/avoindata-datasetlist/README.md delete mode 100644 drupal/modules/avoindata-datasetlist/avoindata_datasetlist.info.yml delete mode 100644 drupal/modules/avoindata-datasetlist/avoindata_datasetlist.module delete mode 100644 drupal/modules/avoindata-datasetlist/src/Plugin/Block/DatasetlistBlock.php delete mode 100644 drupal/modules/avoindata-datasetlist/templates/avoindata_datasetlist_block.html.twig diff --git a/drupal/modules/avoindata-appfeed/README.md b/drupal/modules/avoindata-appfeed/README.md deleted file mode 100644 index 649a17bfbd..0000000000 --- a/drupal/modules/avoindata-appfeed/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Avoindata app feed module # - -Avoindata app feed module. diff --git a/drupal/modules/avoindata-appfeed/avoindata_appfeed.info.yml b/drupal/modules/avoindata-appfeed/avoindata_appfeed.info.yml deleted file mode 100644 index 556d863060..0000000000 --- a/drupal/modules/avoindata-appfeed/avoindata_appfeed.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: Avoindata App Feed -type: module -description: Creates app feed component -package: Custom -core: 8.x -core_version_requirement: ^8 || ^9 diff --git a/drupal/modules/avoindata-appfeed/avoindata_appfeed.module b/drupal/modules/avoindata-appfeed/avoindata_appfeed.module deleted file mode 100644 index 7a60e06115..0000000000 --- a/drupal/modules/avoindata-appfeed/avoindata_appfeed.module +++ /dev/null @@ -1,132 +0,0 @@ - [ - 'variables' => [ - 'applications' => NULL, - 'language' => NULL, - ], - 'template' => 'avoindata_appfeed_block', - ], - ]; -} - -class AvoindataApplicationHandler implements TrustedCallbackInterface -{ - - - /** - * Return HTML of app list. - */ - function avoindata_recent_applications() - { - $client = \Drupal::httpClient(); - - try { - $recentApplicationsResponse = $client->request('POST', 'http://' . getenv('NGINX_HOST') . '/data/api/action/package_search', - ['json' => ['fq' => 'dataset_type:showcase', 'sort' => 'metadata_modified desc', 'rows' => 3]]); - $recentApplicationsResult = Json::decode($recentApplicationsResponse->getBody()); - $recentApplications = $recentApplicationsResult['result']['results']; - } catch (\Exception $e) { - $recentApplications = []; - } - - $resultHTML = ''; - $currentLang = \Drupal::languageManager()->getCurrentLanguage()->getId(); - - foreach ($recentApplications as $app) { - - if (strlen($app['featured_image']) != 0) { - $app_featured_image = $app['featured_image_display_url']; - } elseif (strlen($app['icon_display_url']) != 0) { - $app_featured_image = $app['icon_display_url']; - } else { - $app_featured_image = '/data/images/showcase_placeholder.png'; - } - - $app_date = \Drupal::service('date.formatter')->format(strtotime($app['metadata_created']), 'avoindata_long_date'); - $app_notes = $app['notes_translated'][$currentLang] ?? ""; - - if (is_array($app['category']) && array_key_exists($currentLang, $app['category'])) { - $app_categories = implode(",", $app['category'][$currentLang]); - } else { - $app_categories = ""; - } - - $converter = new CommonMarkConverter(); - $renderedNotes = $converter->convertToHtml($app_notes); - $renderedNotesText = Xss::filter($renderedNotes, array('p')); - - $resultHTML .= << - -
- - {$app['title']} - - -

- - - {$app_date} - - - - {$app_categories} - -

-
- -

- {$renderedNotesText} -

- -
-
- -EOT; - } - - return [ - '#markup' => $resultHTML, - '#cache' => ['max-age' => 0], - ]; - } - - /** - * {@inheritdoc} - */ - public static function trustedCallbacks() { - return ['avoindata_recent_applications']; - } -} diff --git a/drupal/modules/avoindata-appfeed/src/Plugin/Block/AppFeedBlock.php b/drupal/modules/avoindata-appfeed/src/Plugin/Block/AppFeedBlock.php deleted file mode 100644 index 0cca01e6bc..0000000000 --- a/drupal/modules/avoindata-appfeed/src/Plugin/Block/AppFeedBlock.php +++ /dev/null @@ -1,37 +0,0 @@ - [\AvoindataApplicationHandler::class . - ':avoindata_recent_applications', [], - ], - '#create_placeholder' => FALSE, - ]; - - return [ - '#applications' => $recentApplications, - '#language' => \Drupal::languageManager()->getCurrentLanguage()->getId(), - '#theme' => 'avoindata_appfeed', - ]; - } - -} diff --git a/drupal/modules/avoindata-appfeed/templates/avoindata_appfeed_block.html.twig b/drupal/modules/avoindata-appfeed/templates/avoindata_appfeed_block.html.twig deleted file mode 100644 index 079f9a72a9..0000000000 --- a/drupal/modules/avoindata-appfeed/templates/avoindata_appfeed_block.html.twig +++ /dev/null @@ -1,31 +0,0 @@ -{# -/** - * @file - * Avoindata App Feed Block - * - * @ingroup themeable - */ -#} -
-
-
-
-

- {% trans %} - Applications - {% endtrans %} -

-
-
-
-
- {{ applications }} -
-
- - {% trans %}Show all applications{% endtrans %} - -
-
-
-
diff --git a/drupal/modules/avoindata-datasetlist/README.md b/drupal/modules/avoindata-datasetlist/README.md deleted file mode 100644 index d8895cf6ac..0000000000 --- a/drupal/modules/avoindata-datasetlist/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Avoindata dataset list module # - -Avoindata dataset list module. diff --git a/drupal/modules/avoindata-datasetlist/avoindata_datasetlist.info.yml b/drupal/modules/avoindata-datasetlist/avoindata_datasetlist.info.yml deleted file mode 100644 index 87777253e0..0000000000 --- a/drupal/modules/avoindata-datasetlist/avoindata_datasetlist.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: Avoindata Dataset List -type: module -description: Creates dataset list component -package: Custom -core: 8.x -core_version_requirement: ^8 || ^9 diff --git a/drupal/modules/avoindata-datasetlist/avoindata_datasetlist.module b/drupal/modules/avoindata-datasetlist/avoindata_datasetlist.module deleted file mode 100644 index e269a8dc96..0000000000 --- a/drupal/modules/avoindata-datasetlist/avoindata_datasetlist.module +++ /dev/null @@ -1,166 +0,0 @@ - [ - 'variables' => [ - 'recentdatasets' => NULL, - 'newdatasets' => NULL, - 'populardatasets' => NULL, - 'language' => NULL, - ], - 'template' => 'avoindata_datasetlist_block', - ], - ]; -} - -/** - * Returns a number of HTML table rows based on the list of datasets given. - */ -function create_dataset_table_rows($dataset_list, $date_type) { - $currentLang = \Drupal::languageManager()->getCurrentLanguage()->getId(); - - $resultHTML = ''; - $field_for_date = ($date_type ? $date_type : 'metadata_modified'); - - if (count($dataset_list) > 0) { - foreach ($dataset_list as $dataset) { - $created_date = date('d.m.Y', strtotime($dataset[$field_for_date])); - $translated_title = ( - $dataset['title_translated'][$currentLang] - ? $dataset['title_translated'][$currentLang] - : $dataset['title_translated']['fi'] - ); - - $translated_description = ( - $dataset['notes_translated'][$currentLang] - ? $dataset['notes_translated'][$currentLang] - : $dataset['notes_translated']['fi'] - ); - - $converter = new CommonMarkConverter(); - $translated_description = $converter->convertToHtml($translated_description); - $translated_description = Xss::filter($translated_description, array('p')); - - $translated_label = strtoupper(t('Modified')); - - $resultHTML .= << -

{$translated_title}

-
{$translated_label} {$created_date}
-
{$translated_description}
-
- -EOT; - } - } - return $resultHTML; -} - -class AvoindataDatasetHandler implements TrustedCallbackInterface -{ - - - /** - * Gets recent datasets from Ckan and specifies that they won't be cached. - */ - function avoindata_recent_datasets() - { - $client = \Drupal::httpClient(); - try { - $recentDatasetsResponse = $client->request('POST', - 'http://' . getenv('NGINX_HOST') . '/data/api/action/package_search', - ['json' => ['sort' => 'metadata_modified desc', 'facet.limit' => 1, 'rows' =>3]] - ); - $recentDatasetsResult = Json::decode($recentDatasetsResponse->getBody()); - $recentDatasets = $recentDatasetsResult['result']['results']; - } catch (\Exception $e) { - $recentDatasets = NULL; - } - - return [ - '#markup' => create_dataset_table_rows($recentDatasets, 'metadata_modified'), - '#cache' => ['max-age' => 0], - ]; - } - - /** - * Gets new datasets from Ckan and specifies that they won't be cached. - */ - function avoindata_new_datasets() - { - $client = \Drupal::httpClient(); - try { - $newDatasetsResponse = $client->request('POST', - 'http://' . getenv('NGINX_HOST') . '/data/api/action/package_search', - ['json' => ['sort' => 'metadata_created desc', 'facet.limit' => 1, 'rows' =>3]] - ); - $newDatasetsResult = Json::decode($newDatasetsResponse->getBody()); - $newDatasets = $newDatasetsResult['result']['results']; - } catch (\Exception $e) { - $newDatasets = NULL; - } - - return [ - '#markup' => create_dataset_table_rows($newDatasets, NULL), - '#cache' => ['max-age' => 0], - ]; - } - - /** - * Gets popular datasets from Ckan and specifies that they won't be cached. - */ - function avoindata_popular_datasets() - { - $client = \Drupal::httpClient(); - try { - $popularDatasetsResponse = $client->request('POST', - 'http://' . getenv('NGINX_HOST') . '/data/api/action/package_search', - ['json' => ['sort' => 'views_recent desc', 'facet.limit' => 1, 'rows' =>3]] - ); - $popularDatasetsResult = Json::decode($popularDatasetsResponse->getBody()); - $popularDatasets = $popularDatasetsResult['result']['results']; - } catch (\Exception $e) { - $popularDatasets = NULL; - } - - return [ - '#markup' => create_dataset_table_rows($popularDatasets, NULL), - '#cache' => ['max-age' => 0], - ]; - } - - /** - * {@inheritdoc} - */ - public static function trustedCallbacks() { - return ['avoindata_recent_datasets', 'avoindata_new_datasets', 'avoindata_popular_datasets']; - } - -} diff --git a/drupal/modules/avoindata-datasetlist/src/Plugin/Block/DatasetlistBlock.php b/drupal/modules/avoindata-datasetlist/src/Plugin/Block/DatasetlistBlock.php deleted file mode 100644 index f81d845941..0000000000 --- a/drupal/modules/avoindata-datasetlist/src/Plugin/Block/DatasetlistBlock.php +++ /dev/null @@ -1,56 +0,0 @@ - [\AvoindataDatasetHandler::class . - ':avoindata_recent_datasets', [], - ], - '#create_placeholder' => FALSE, - ]; - - // New datasets. - $newDatasets = [ - '#lazy_builder' => [\AvoindataDatasetHandler::class . - ':avoindata_new_datasets', [], - ], - '#create_placeholder' => FALSE, - ]; - - // Popular datasets. - $popularDatasets = [ - '#lazy_builder' => [\AvoindataDatasetHandler::class . - ':avoindata_popular_datasets', [], - ], - '#create_placeholder' => FALSE, - ]; - - return [ - '#recentdatasets' => $recentDatasets, - '#newdatasets' => $newDatasets, - '#populardatasets' => $popularDatasets, - '#language' => \Drupal::languageManager()->getCurrentLanguage()->getId(), - '#theme' => 'avoindata_datasetlist', - ]; - } - -} diff --git a/drupal/modules/avoindata-datasetlist/templates/avoindata_datasetlist_block.html.twig b/drupal/modules/avoindata-datasetlist/templates/avoindata_datasetlist_block.html.twig deleted file mode 100644 index 0aac02f0d1..0000000000 --- a/drupal/modules/avoindata-datasetlist/templates/avoindata_datasetlist_block.html.twig +++ /dev/null @@ -1,113 +0,0 @@ -{# -/** - * @file - * Avoindata Dataset List Block - * - * @ingroup themeable - */ -#} -
-
-
-
-

- {% trans %} - Datasets - {% endtrans %} -

-
-
-
-
- -
-
-
-
- - - - - -
-
-
-
-

- {% trans with {'context': 'datasetlist offer data heading'} %} - Open your data - {% endtrans %} -

-

- {% trans with {'context': 'datasetlist offer data paragraph'} %} - Does your organization produce data that could benefit or interest others? We offer guidance and a distribution channel for your datasets. - {% endtrans %} -

-
-
- {% if not logged_in %} - -
- - {% trans with {'context': 'datasetlist offer data register'} %}Become publisher{% endtrans %} - -
- {% endif %} -
-
-
-
From 61de211482419adfe07bb681713457ae6a31b47f Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 14:34:19 +0300 Subject: [PATCH 09/12] AV-2055: Delete easy_install, libraries and protected_submissions which were unused --- drupal/composer.json | 5 +- drupal/composer.lock | 169 +------------------------------------------ 2 files changed, 4 insertions(+), 170 deletions(-) diff --git a/drupal/composer.json b/drupal/composer.json index 7fcc29ab91..2ce93beae5 100755 --- a/drupal/composer.json +++ b/drupal/composer.json @@ -29,12 +29,10 @@ "drupal/domain_registration": "^1.8", "drupal/drush_language": "1.x-dev", "drupal/easy_breadcrumb": "^2.0", - "drupal/easy_install": "^10.2", "drupal/fontawesome": "^2.25", "drupal/fontawesome_menu_icons": "^1.3", "drupal/honeypot": "^2.0", "drupal/imce": "^3.0", - "drupal/libraries": "^3.0@alpha", "drupal/matomo": "^1.11", "drupal/menu_item_role_access": "^2.0", "drupal/menu_link_attributes": "^1.3", @@ -42,7 +40,6 @@ "drupal/password_policy": "^3.1", "drupal/pathauto": "^1.2", "drupal/protected_forms": "^2.0", - "drupal/protected_submissions": "^1.9", "drupal/raven": "^4.0", "drupal/recaptcha": "^3.0", "drupal/redirect": "^1.2", @@ -145,4 +142,4 @@ "kint-php/kint": "^5.0", "squizlabs/php_codesniffer": "^3.6" } -} \ No newline at end of file +} diff --git a/drupal/composer.lock b/drupal/composer.lock index 8403acaac1..e724a70035 100755 --- a/drupal/composer.lock +++ b/drupal/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "12b1945ef1d4746ec35720ad90f8958e", + "content-hash": "215e17b26f7c8feb38b6b0ad16b577bf", "packages": [ { "name": "alchemy/zippy", @@ -2898,54 +2898,6 @@ "issues": "https://www.drupal.org/project/issues/easy_breadcrumb" } }, - { - "name": "drupal/easy_install", - "version": "10.5.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/easy_install.git", - "reference": "8.x-10.5" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/easy_install-8.x-10.5.zip", - "reference": "8.x-10.5", - "shasum": "0c7d4d5d8cc11551910a6b1c9860dfa69156d0a8" - }, - "require": { - "drupal/core": "^8 || ^9" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-10.5", - "datestamp": "1625497608", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "btobac", - "homepage": "https://www.drupal.org/user/3630142" - }, - { - "name": "karthikeyan-manivasagam", - "homepage": "https://www.drupal.org/user/1494424" - } - ], - "description": "Provides UI to delete configuration while uninstalling or reinstalling the modules.", - "homepage": "https://www.drupal.org/project/easy_install", - "support": { - "source": "https://git.drupalcode.org/project/easy_install" - } - }, { "name": "drupal/fontawesome", "version": "2.26.0", @@ -3167,72 +3119,6 @@ "issues": "https://www.drupal.org/project/issues/imce" } }, - { - "name": "drupal/libraries", - "version": "3.0.0-beta3", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/libraries.git", - "reference": "8.x-3.0-beta3" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/libraries-8.x-3.0-beta3.zip", - "reference": "8.x-3.0-beta3", - "shasum": "5feb776342d065a276c1409c1f0f306cf2834b53" - }, - "require": { - "drupal/core": "^8.8 || ^9" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-3.0-beta3", - "datestamp": "1679503579", - "security-coverage": { - "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "joseph.olstad", - "homepage": "https://www.drupal.org/user/1321830" - }, - { - "name": "podarok", - "homepage": "https://www.drupal.org/user/116002" - }, - { - "name": "Pol", - "homepage": "https://www.drupal.org/user/47194" - }, - { - "name": "rjacobs", - "homepage": "https://www.drupal.org/user/422459" - }, - { - "name": "sun", - "homepage": "https://www.drupal.org/user/54136" - }, - { - "name": "tstoeckler", - "homepage": "https://www.drupal.org/user/107158" - } - ], - "description": "Allows version-dependent and shared usage of external libraries in Drupal.", - "homepage": "http://drupal.org/project/libraries", - "support": { - "source": "https://git.drupalcode.org/project/libraries", - "issues": "http://drupal.org/project/issues/libraries", - "irc": "irc://irc.freenode.org/drupal-contribute" - } - }, { "name": "drupal/matomo", "version": "1.22.0", @@ -3645,54 +3531,6 @@ "source": "https://git.drupalcode.org/project/protected_forms" } }, - { - "name": "drupal/protected_submissions", - "version": "1.9.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/protected_submissions.git", - "reference": "8.x-1.9" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/protected_submissions-8.x-1.9.zip", - "reference": "8.x-1.9", - "shasum": "9a47b84d7be0b22af7624928c5057c4b8bf115f9" - }, - "require": { - "drupal/core": "^8 || ^9" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-1.9", - "datestamp": "1628410030", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "AltaGrade", - "homepage": "https://www.drupal.org/user/3567546" - }, - { - "name": "brad.bulger", - "homepage": "https://www.drupal.org/user/64630" - } - ], - "description": "Prevents submissions that contain undesired patterns.", - "homepage": "https://www.drupal.org/project/protected_submissions", - "support": { - "source": "https://git.drupalcode.org/project/protected_submissions" - } - }, { "name": "drupal/raven", "version": "4.0.22", @@ -15569,12 +15407,11 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/drush_language": 20, - "drupal/libraries": 15 + "drupal/drush_language": 20 }, "prefer-stable": true, "prefer-lowest": false, "platform": [], "platform-dev": [], "plugin-api-version": "2.3.0" -} \ No newline at end of file +} From f6706a02840207f2b95944e45260d76de26d9ca1 Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 14:38:26 +0300 Subject: [PATCH 10/12] AV-2055: delete appfeed and datasetlist from dockerfile --- drupal/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/drupal/Dockerfile b/drupal/Dockerfile index e48062a9cf..d701b3c511 100644 --- a/drupal/Dockerfile +++ b/drupal/Dockerfile @@ -99,8 +99,6 @@ COPY modules/avoindata-guide ${MOD_DIR}/avoindata-guide/ COPY modules/avoindata-user ${MOD_DIR}/avoindata-user/ COPY modules/avoindata-ckeditor-plugins ${MOD_DIR}/avoindata-ckeditor-plugins/ COPY modules/avoindata-theme ${MOD_DIR}/avoindata-theme/ -COPY modules/avoindata-appfeed ${MOD_DIR}/avoindata-appfeed/ -COPY modules/avoindata-datasetlist ${MOD_DIR}/avoindata-datasetlist/ COPY modules/avoindata-ckeditor5-plugins ${MOD_DIR}/avoindata-ckeditor5-plugins/ From 491af4b4c0cdf311f1688efe1c900b58601407e7 Mon Sep 17 00:00:00 2001 From: YTP Bot Date: Wed, 11 Oct 2023 12:30:52 +0000 Subject: [PATCH 11/12] [skip ci] .env.template updated by new image tags --- docker/.env.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/.env.template b/docker/.env.template index bd33ef8e57..88348c2803 100644 --- a/docker/.env.template +++ b/docker/.env.template @@ -3,8 +3,8 @@ REGISTRY="" REPOSITORY="" # opendata images -CKAN_IMAGE_TAG="67e00941ce19d3c4725314a70cbacc6a94f6d1c8" -DRUPAL_IMAGE_TAG="67e00941ce19d3c4725314a70cbacc6a94f6d1c8" +CKAN_IMAGE_TAG="e1431c8f9fda9cbc22b52a764af8f27c2d9e5148" +DRUPAL_IMAGE_TAG="e1431c8f9fda9cbc22b52a764af8f27c2d9e5148" SOLR_IMAGE_TAG="acedaa3c1d35875178b6d104fe413bef0bbdd155" NGINX_IMAGE_TAG="cc823d149f1f80af4354a6f38973cec9fb994cc1" DATAPUSHER_IMAGE_TAG="37245d2426ed6218a7352115d4147139defc9d8e" From b554dea7680eec51facc7e83c34b3f8c6d12048b Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2023 16:42:49 +0300 Subject: [PATCH 12/12] Uninstall avoindata_infobox --- drupal/scripts/init_drupal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal/scripts/init_drupal.sh b/drupal/scripts/init_drupal.sh index 72c307ed32..5169cb6105 100644 --- a/drupal/scripts/init_drupal.sh +++ b/drupal/scripts/init_drupal.sh @@ -113,6 +113,7 @@ echo "uninstall modules.." [[ "$MODULE_INFO" == *"contextual"* ]] && drush pm:uninstall -y contextual [[ "$MODULE_INFO" == *"page_cache"* ]] && drush pm:uninstall -y page_cache [[ "$MODULE_INFO" == *"protected_submissions"* ]] && drush pm:uninstall -y protected_submissions +[[ "$MODULE_INFO" == *"avoindata_infobox"* ]] && drush pm:uninstall -y avoindata_infobox # enable modules echo "enable modules.." @@ -165,7 +166,6 @@ echo "enable custom modules.." [[ "$MODULE_INFO" != *"avoindata_servicemessage"* ]] && drush pm:enable -y avoindata_servicemessage [[ "$MODULE_INFO" != *"avoindata_hero"* ]] && drush pm:enable -y avoindata_hero [[ "$MODULE_INFO" != *"avoindata_categories"* ]] && drush pm:enable -y avoindata_categories -[[ "$MODULE_INFO" != *"avoindata_infobox"* ]] && drush pm:enable -y avoindata_infobox [[ "$MODULE_INFO" != *"avoindata_explore"* ]] && drush pm:enable -y avoindata_explore [[ "$MODULE_INFO" != *"avoindata_newsfeed"* ]] && drush pm:enable -y avoindata_newsfeed [[ "$MODULE_INFO" != *"avoindata_footer"* ]] && drush pm:enable -y avoindata_footer