From ba6a95ba422aadde07df94aae9ec4ec62220d041 Mon Sep 17 00:00:00 2001 From: Teemu Erkkola Date: Tue, 3 Oct 2017 13:03:22 +0300 Subject: [PATCH 1/3] Added ckanext-showcase --- .gitmodules | 3 +++ ansible/roles/ckan-data/files/i18n/fi/LC_MESSAGES/ckan.po | 2 +- ansible/roles/ckan/vars/main.yml | 3 ++- modules/ckanext-showcase | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 160000 modules/ckanext-showcase diff --git a/.gitmodules b/.gitmodules index 1d72702d4a..da110b1b65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -23,3 +23,6 @@ [submodule "modules/ckanext-archiver"] path = modules/ckanext-archiver url = https://github.com/ckan/ckanext-archiver.git +[submodule "modules/ckanext-showcase"] + path = modules/ckanext-showcase + url = https://github.com/ckan/ckanext-showcase.git diff --git a/ansible/roles/ckan-data/files/i18n/fi/LC_MESSAGES/ckan.po b/ansible/roles/ckan-data/files/i18n/fi/LC_MESSAGES/ckan.po index 4617eea465..714f4cb282 100644 --- a/ansible/roles/ckan-data/files/i18n/fi/LC_MESSAGES/ckan.po +++ b/ansible/roles/ckan-data/files/i18n/fi/LC_MESSAGES/ckan.po @@ -4222,7 +4222,7 @@ msgstr "Uutisvirta" #: ckan/templates/user/dashboard.html:20 #: ckan/templates/user/dashboard_datasets.html:12 msgid "My Datasets" -msgstr "Minun tietoaineistot" +msgstr "Minun tietoaineistoni" #: ckan/templates/user/dashboard.html:21 #: ckan/templates/user/dashboard_organizations.html:12 diff --git a/ansible/roles/ckan/vars/main.yml b/ansible/roles/ckan/vars/main.yml index c03993d01c..5441f91934 100644 --- a/ansible/roles/ckan/vars/main.yml +++ b/ansible/roles/ckan/vars/main.yml @@ -7,7 +7,7 @@ celery_user: "{{ www_user }}" ckan_plugins_default: stats # order matters, when templates call super() -ckan_plugins: multilingual_dataset harvest ckan_harvester hri_harvester dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface spatial_metadata spatial_query csw_harvester drupal7 datarequests report qa archiver ytp_organizations ytp_comments ytp_request hierarchy_display ytp_theme ytp_drupal ytp_tasks ytp_dataset ytp_user ytp_service datastore +ckan_plugins: multilingual_dataset harvest ckan_harvester hri_harvester dcat dcat_rdf_harvester dcat_json_harvester dcat_json_interface spatial_metadata spatial_query csw_harvester drupal7 datarequests report qa archiver ytp_organizations ytp_comments ytp_request hierarchy_display ytp_theme ytp_drupal ytp_tasks ytp_dataset ytp_user ytp_service datastore showcase ckan_aws_plugins: cloudstorage @@ -28,6 +28,7 @@ ckan_extensions: - ckanext-qa - ckanext-dcat - ckanext-cloudstorage + - ckanext-showcase redis_harvest_database: 0 diff --git a/modules/ckanext-showcase b/modules/ckanext-showcase new file mode 160000 index 0000000000..eb1567816d --- /dev/null +++ b/modules/ckanext-showcase @@ -0,0 +1 @@ +Subproject commit eb1567816d0e9962965bdf2abdeed00a008d3798 From 493c17080602c73f5cf1d2b2101f4ae520880c65 Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2017 09:35:17 +0300 Subject: [PATCH 2/3] Switch to fork of showcase --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index da110b1b65..1a92535078 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,4 +25,4 @@ url = https://github.com/ckan/ckanext-archiver.git [submodule "modules/ckanext-showcase"] path = modules/ckanext-showcase - url = https://github.com/ckan/ckanext-showcase.git + url = https://github.com/vrk-kpa/ckanext-showcase.git From 51c0e7041bd23bff09197601de73c7d6c4dc08ec Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Wed, 11 Oct 2017 09:53:54 +0300 Subject: [PATCH 3/3] update showcase to use master branch --- modules/ckanext-showcase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ckanext-showcase b/modules/ckanext-showcase index eb1567816d..811af21f76 160000 --- a/modules/ckanext-showcase +++ b/modules/ckanext-showcase @@ -1 +1 @@ -Subproject commit eb1567816d0e9962965bdf2abdeed00a008d3798 +Subproject commit 811af21f7647170646de9ba881c56b2dbed44ebb