diff --git a/CHANGELOG.md b/CHANGELOG.md index 35b878f4ccdd09ba20cce4ff0e9a6ac5c7375cd8..5b2fc3dbb3727ed7626659b7d1a09c0b7b4e8a9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.4.4] + +### Added + +- Added an alert in the dataset edit form if a GUID was detected in the dataset, advising users to avoid manual editing and to contact the publisher for any data change requests. + +### Fixed + +- Fix search input behavior to remember the last entered value. + ## [2.4.3] - 2024-06-25 ### Added diff --git a/ckanext/odsh/i18n/ckanext-odsh.pot b/ckanext/odsh/i18n/ckanext-odsh.pot index bf67edefe4d919d61af05605867ce19808d6141c..63cde313e2ec2814a882e724152f0cda475ddfb5 100644 --- a/ckanext/odsh/i18n/ckanext-odsh.pot +++ b/ckanext/odsh/i18n/ckanext-odsh.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ckanext-odsh 2.4.3\n" +"Project-Id-Version: ckanext-odsh 2.4.4\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-05-16 10:05+0200\n" +"POT-Creation-Date: 2024-09-20 11:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,7 +25,7 @@ msgstr "" msgid "Select spatial reference.." msgstr "" -#: ckanext/odsh/plugin.py:248 ckanext/odsh/plugin.py:257 ckanext/odsh/plugin.py:263 +#: ckanext/odsh/plugin.py:238 ckanext/odsh/plugin.py:247 ckanext/odsh/plugin.py:253 #: ckanext/odsh/templates/header.html:40 #: ckanext/odsh/templates/organization/index.html:3 #: ckanext/odsh/templates/organization/index.html:6 @@ -36,15 +36,15 @@ msgstr "" msgid "Organizations" msgstr "" -#: ckanext/odsh/plugin.py:249 ckanext/odsh/plugin.py:260 ckanext/odsh/plugin.py:266 +#: ckanext/odsh/plugin.py:239 ckanext/odsh/plugin.py:250 ckanext/odsh/plugin.py:256 msgid "Category" msgstr "" -#: ckanext/odsh/plugin.py:250 ckanext/odsh/plugin.py:258 ckanext/odsh/plugin.py:264 +#: ckanext/odsh/plugin.py:240 ckanext/odsh/plugin.py:248 ckanext/odsh/plugin.py:254 msgid "File format" msgstr "" -#: ckanext/odsh/plugin.py:251 ckanext/odsh/plugin.py:259 ckanext/odsh/plugin.py:265 +#: ckanext/odsh/plugin.py:241 ckanext/odsh/plugin.py:249 ckanext/odsh/plugin.py:255 #: ckanext/odsh/templates/package/resource_read.html:162 #: ckanext/odsh/templates/package/snippets/info.html:75 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:110 @@ -52,7 +52,7 @@ msgstr "" msgid "License" msgstr "" -#: ckanext/odsh/plugin.py:253 +#: ckanext/odsh/plugin.py:243 msgid "Open-Data-Eigenschaften" msgstr "" @@ -227,8 +227,8 @@ msgstr "" #: ckanext/odsh/templates/package/base.html:7 #: ckanext/odsh/templates/package/base.html:17 #: ckanext/odsh/templates/package/base.html:22 -#: ckanext/odsh/templates/package/read.html:21 -#: ckanext/odsh/templates/package/read.html:25 +#: ckanext/odsh/templates/package/read.html:19 +#: ckanext/odsh/templates/package/read.html:23 #: ckanext/odsh/templates/package/search.html:10 msgid "Datasets" msgstr "" @@ -253,27 +253,35 @@ msgstr "" msgid "View profile" msgstr "" -#: ckanext/odsh/templates/header.html:89 ckanext/odsh/templates/header.html:92 +#: ckanext/odsh/templates/header.html:89 +msgid "View dashboard" +msgstr "" + +#: ckanext/odsh/templates/header.html:91 +msgid "Dashboard" +msgstr "" + +#: ckanext/odsh/templates/header.html:97 ckanext/odsh/templates/header.html:100 msgid "Edit profile" msgstr "" -#: ckanext/odsh/templates/header.html:99 ckanext/odsh/templates/header.html:101 +#: ckanext/odsh/templates/header.html:107 ckanext/odsh/templates/header.html:109 #: ckanext/odsh/templates/user/logout.html:4 msgid "Logout" msgstr "" -#: ckanext/odsh/templates/header.html:110 ckanext/odsh/templates/header.html:111 +#: ckanext/odsh/templates/header.html:118 ckanext/odsh/templates/header.html:119 #: ckanext/odsh/templates/user/login.html:3 #: ckanext/odsh/templates/user/login.html:10 #: ckanext/odsh/templates/user/login.html:16 msgid "Login" msgstr "" -#: ckanext/odsh/templates/header.html:116 +#: ckanext/odsh/templates/header.html:124 msgid "Sign language" msgstr "" -#: ckanext/odsh/templates/header.html:119 +#: ckanext/odsh/templates/header.html:127 msgid "Simple language" msgstr "" @@ -572,7 +580,7 @@ msgstr "" #: ckanext/odsh/templates/organization/snippets/organization_form.html:89 #: ckanext/odsh/templates/package/edit_view.html:19 -#: ckanext/odsh/templates/package/snippets/package_form.html:32 +#: ckanext/odsh/templates/package/snippets/package_form.html:41 #: ckanext/odsh/templates/package/snippets/resource_form.html:92 #: ckanext/odsh/templates/user/edit_user_form.html:84 msgid "Delete" @@ -589,7 +597,7 @@ msgstr "" #: ckanext/odsh/templates/package/base.html:23 #: ckanext/odsh/templates/package/edit_base.html:9 #: ckanext/odsh/templates/package/new_package_form.html:6 -#: ckanext/odsh/templates/package/read.html:26 +#: ckanext/odsh/templates/package/read.html:24 msgid "Create Dataset" msgstr "" @@ -671,78 +679,78 @@ msgstr "" msgid "Add" msgstr "" -#: ckanext/odsh/templates/package/read.html:38 +#: ckanext/odsh/templates/package/read.html:36 #: ckanext/odsh/templates/snippets/package_item.html:81 msgid "Draft" msgstr "" -#: ckanext/odsh/templates/package/read.html:41 +#: ckanext/odsh/templates/package/read.html:39 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:289 #: ckanext/odsh/templates/snippets/organization.html:24 #: ckanext/odsh/templates/snippets/package_item.html:83 msgid "Deleted" msgstr "" -#: ckanext/odsh/templates/package/read.html:47 +#: ckanext/odsh/templates/package/read.html:45 msgid "Manage Dataset" msgstr "" -#: ckanext/odsh/templates/package/read.html:54 +#: ckanext/odsh/templates/package/read.html:52 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:265 #: ckanext/odsh/templates/snippets/package_item.html:70 msgid "Private" msgstr "" -#: ckanext/odsh/templates/package/read.html:70 +#: ckanext/odsh/templates/package/read.html:68 msgid "Detailed information" msgstr "" -#: ckanext/odsh/templates/package/read.html:74 +#: ckanext/odsh/templates/package/read.html:72 #, python-format msgid "" "Note: A <a href=\"%(latest_collection_member)s\">newer version</a> of this " "dataset is available." msgstr "" -#: ckanext/odsh/templates/package/read.html:81 +#: ckanext/odsh/templates/package/read.html:80 #, python-format msgid "" "Note: This dataset has been replaced with a <a " "href=\"%(is_replaced_by)s\">newer version</a>." msgstr "" -#: ckanext/odsh/templates/package/read.html:93 +#: ckanext/odsh/templates/package/read.html:92 #: ckanext/odsh/templates/package/snippets/resource_item.html:29 msgid "Read more »" msgstr "" -#: ckanext/odsh/templates/package/read.html:94 +#: ckanext/odsh/templates/package/read.html:93 #: ckanext/odsh/templates/package/snippets/resource_item.html:30 msgid "« Read less" msgstr "" -#: ckanext/odsh/templates/package/read.html:110 +#: ckanext/odsh/templates/package/read.html:109 msgid "Add new resource" msgstr "" -#: ckanext/odsh/templates/package/read.html:120 +#: ckanext/odsh/templates/package/read.html:119 #, python-format msgid "" "This record is part of the series <a href=\"%(url)s\">%(title)s</a>. You can " "browse to older and newer records." msgstr "" -#: ckanext/odsh/templates/package/read.html:128 +#: ckanext/odsh/templates/package/read.html:127 msgid "latest collection member" msgstr "" -#: ckanext/odsh/templates/package/read.html:133 -#: ckanext/odsh/templates/package/read.html:138 +#: ckanext/odsh/templates/package/read.html:132 +#: ckanext/odsh/templates/package/read.html:137 msgid "predecessor" msgstr "" -#: ckanext/odsh/templates/package/read.html:143 -#: ckanext/odsh/templates/package/read.html:148 +#: ckanext/odsh/templates/package/read.html:142 +#: ckanext/odsh/templates/package/read.html:147 msgid "successor" msgstr "" @@ -1092,15 +1100,31 @@ msgstr "" msgid "Applicable Legislation" msgstr "" -#: ckanext/odsh/templates/package/snippets/package_form.html:31 +#: ckanext/odsh/templates/package/snippets/package_form.html:8 +msgid "GUID detected" +msgstr "" + +#: ckanext/odsh/templates/package/snippets/package_form.html:9 +msgid "" +"A GUID was detected in the dataset's extras, suggesting it was likely " +"generated by a harvester. Manual editing is not recommended." +msgstr "" + +#: ckanext/odsh/templates/package/snippets/package_form.html:10 +msgid "" +"Please contact the publisher if you would like to request any changes to the " +"metadata." +msgstr "" + +#: ckanext/odsh/templates/package/snippets/package_form.html:40 msgid "Are you sure you want to delete this dataset?" msgstr "" -#: ckanext/odsh/templates/package/snippets/package_form.html:37 +#: ckanext/odsh/templates/package/snippets/package_form.html:46 msgid "Next: Add Data" msgstr "" -#: ckanext/odsh/templates/package/snippets/package_form.html:44 +#: ckanext/odsh/templates/package/snippets/package_form.html:53 #: ckanext/odsh/templates/package/snippets/resource_form.html:119 msgid "Required information" msgstr "" @@ -1560,7 +1584,3 @@ msgstr "" msgid "do Login" msgstr "" -#: ckanext/odsh/views/dashboard.py:16 -msgid "Not authorized to see this page" -msgstr "" - diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo index 582dc5a413db090bba201e00eb1c51d5087980d9..95eb1f1155d8c4b60ecd0cf9ea80bc50e37e18b9 100644 Binary files a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo and b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.mo differ diff --git a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po index b2c0ddaac01800b49e42db01ef420aea035ae337..5c2933846d4fa7d812cbf992a95756e558a2182d 100644 --- a/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po +++ b/ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ckanext-odsh 2.0.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-05-16 10:05+0200\n" -"PO-Revision-Date: 2024-05-16 10:11+0200\n" +"POT-Creation-Date: 2024-09-20 11:17+0200\n" +"PO-Revision-Date: 2024-09-23 10:44+0200\n" "Last-Translator: \n" "Language-Team: de <LL@li.org>\n" "Language: de\n" @@ -28,8 +28,8 @@ msgstr "Musterdatensatz wählen.." msgid "Select spatial reference.." msgstr "Raumbezug wählen.." -#: ckanext/odsh/plugin.py:248 ckanext/odsh/plugin.py:257 -#: ckanext/odsh/plugin.py:263 ckanext/odsh/templates/header.html:40 +#: ckanext/odsh/plugin.py:238 ckanext/odsh/plugin.py:247 +#: ckanext/odsh/plugin.py:253 ckanext/odsh/templates/header.html:40 #: ckanext/odsh/templates/organization/index.html:3 #: ckanext/odsh/templates/organization/index.html:6 #: ckanext/odsh/templates/organization/index.html:32 @@ -39,18 +39,18 @@ msgstr "Raumbezug wählen.." msgid "Organizations" msgstr "Herausgeber" -#: ckanext/odsh/plugin.py:249 ckanext/odsh/plugin.py:260 -#: ckanext/odsh/plugin.py:266 +#: ckanext/odsh/plugin.py:239 ckanext/odsh/plugin.py:250 +#: ckanext/odsh/plugin.py:256 msgid "Category" msgstr "Kategorie" -#: ckanext/odsh/plugin.py:250 ckanext/odsh/plugin.py:258 -#: ckanext/odsh/plugin.py:264 +#: ckanext/odsh/plugin.py:240 ckanext/odsh/plugin.py:248 +#: ckanext/odsh/plugin.py:254 msgid "File format" msgstr "Dateiformat" -#: ckanext/odsh/plugin.py:251 ckanext/odsh/plugin.py:259 -#: ckanext/odsh/plugin.py:265 +#: ckanext/odsh/plugin.py:241 ckanext/odsh/plugin.py:249 +#: ckanext/odsh/plugin.py:255 #: ckanext/odsh/templates/package/resource_read.html:162 #: ckanext/odsh/templates/package/snippets/info.html:75 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:110 @@ -58,7 +58,7 @@ msgstr "Dateiformat" msgid "License" msgstr "Lizenz" -#: ckanext/odsh/plugin.py:253 +#: ckanext/odsh/plugin.py:243 msgid "Open-Data-Eigenschaften" msgstr "Open-Data-Eigenschaften" @@ -239,8 +239,8 @@ msgstr "Schließen" #: ckanext/odsh/templates/package/base.html:7 #: ckanext/odsh/templates/package/base.html:17 #: ckanext/odsh/templates/package/base.html:22 -#: ckanext/odsh/templates/package/read.html:21 -#: ckanext/odsh/templates/package/read.html:25 +#: ckanext/odsh/templates/package/read.html:19 +#: ckanext/odsh/templates/package/read.html:23 #: ckanext/odsh/templates/package/search.html:10 msgid "Datasets" msgstr "Datensätze" @@ -265,28 +265,37 @@ msgstr "Admin" msgid "View profile" msgstr "Mein Profil einsehen" -#: ckanext/odsh/templates/header.html:89 ckanext/odsh/templates/header.html:92 +#: ckanext/odsh/templates/header.html:89 +msgid "View dashboard" +msgstr "Dashboard anzeigen" + +#: ckanext/odsh/templates/header.html:91 +msgid "Dashboard" +msgstr "Dashboard" + +#: ckanext/odsh/templates/header.html:97 ckanext/odsh/templates/header.html:100 msgid "Edit profile" msgstr "Mein Profil bearbeiten" -#: ckanext/odsh/templates/header.html:99 ckanext/odsh/templates/header.html:101 +#: ckanext/odsh/templates/header.html:107 +#: ckanext/odsh/templates/header.html:109 #: ckanext/odsh/templates/user/logout.html:4 msgid "Logout" msgstr "Logout" -#: ckanext/odsh/templates/header.html:110 -#: ckanext/odsh/templates/header.html:111 +#: ckanext/odsh/templates/header.html:118 +#: ckanext/odsh/templates/header.html:119 #: ckanext/odsh/templates/user/login.html:3 #: ckanext/odsh/templates/user/login.html:10 #: ckanext/odsh/templates/user/login.html:16 msgid "Login" msgstr "Login" -#: ckanext/odsh/templates/header.html:116 +#: ckanext/odsh/templates/header.html:124 msgid "Sign language" msgstr "Gebärdensprache" -#: ckanext/odsh/templates/header.html:119 +#: ckanext/odsh/templates/header.html:127 msgid "Simple language" msgstr "Einfache Sprache" @@ -592,7 +601,7 @@ msgstr "" #: ckanext/odsh/templates/organization/snippets/organization_form.html:89 #: ckanext/odsh/templates/package/edit_view.html:19 -#: ckanext/odsh/templates/package/snippets/package_form.html:32 +#: ckanext/odsh/templates/package/snippets/package_form.html:41 #: ckanext/odsh/templates/package/snippets/resource_form.html:92 #: ckanext/odsh/templates/user/edit_user_form.html:84 msgid "Delete" @@ -609,7 +618,7 @@ msgstr "{organization_name} anzeigen" #: ckanext/odsh/templates/package/base.html:23 #: ckanext/odsh/templates/package/edit_base.html:9 #: ckanext/odsh/templates/package/new_package_form.html:6 -#: ckanext/odsh/templates/package/read.html:26 +#: ckanext/odsh/templates/package/read.html:24 msgid "Create Dataset" msgstr "Datensatz-Upload" @@ -697,33 +706,33 @@ msgstr "" msgid "Add" msgstr "Hinzufügen" -#: ckanext/odsh/templates/package/read.html:38 +#: ckanext/odsh/templates/package/read.html:36 #: ckanext/odsh/templates/snippets/package_item.html:81 msgid "Draft" msgstr "Entwurf" -#: ckanext/odsh/templates/package/read.html:41 +#: ckanext/odsh/templates/package/read.html:39 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:289 #: ckanext/odsh/templates/snippets/organization.html:24 #: ckanext/odsh/templates/snippets/package_item.html:83 msgid "Deleted" msgstr "Gelöscht" -#: ckanext/odsh/templates/package/read.html:47 +#: ckanext/odsh/templates/package/read.html:45 msgid "Manage Dataset" msgstr "Datensatz bearbeiten" -#: ckanext/odsh/templates/package/read.html:54 +#: ckanext/odsh/templates/package/read.html:52 #: ckanext/odsh/templates/package/snippets/package_basic_fields.html:265 #: ckanext/odsh/templates/snippets/package_item.html:70 msgid "Private" msgstr "Privat" -#: ckanext/odsh/templates/package/read.html:70 +#: ckanext/odsh/templates/package/read.html:68 msgid "Detailed information" msgstr "Detailinformationen" -#: ckanext/odsh/templates/package/read.html:74 +#: ckanext/odsh/templates/package/read.html:72 #, python-format msgid "" "Note: A <a href=\"%(latest_collection_member)s\">newer version</a> of this " @@ -732,7 +741,7 @@ msgstr "" "Hinweis: Eine <a href=\"%(latest_collection_member)s\">neuere Version</a> " "dieses Datensatzes ist verfügbar." -#: ckanext/odsh/templates/package/read.html:81 +#: ckanext/odsh/templates/package/read.html:80 #, python-format msgid "" "Note: This dataset has been replaced with a <a " @@ -741,21 +750,21 @@ msgstr "" "Hinweis: Dieser Datensatz wurde durch eine <a " "href=\"%(is_replaced_by)s\">neuere Version</a> ersetzt." -#: ckanext/odsh/templates/package/read.html:93 +#: ckanext/odsh/templates/package/read.html:92 #: ckanext/odsh/templates/package/snippets/resource_item.html:29 msgid "Read more »" msgstr "Mehr erfahren »" -#: ckanext/odsh/templates/package/read.html:94 +#: ckanext/odsh/templates/package/read.html:93 #: ckanext/odsh/templates/package/snippets/resource_item.html:30 msgid "« Read less" msgstr "« Weniger anzeigen" -#: ckanext/odsh/templates/package/read.html:110 +#: ckanext/odsh/templates/package/read.html:109 msgid "Add new resource" msgstr "Neue Ressource hinzufügen" -#: ckanext/odsh/templates/package/read.html:120 +#: ckanext/odsh/templates/package/read.html:119 #, python-format msgid "" "This record is part of the series <a href=\"%(url)s\">%(title)s</a>. You can " @@ -764,17 +773,17 @@ msgstr "" "Dieser Datensatz ist Bestandteil der Reihe <a href=\"%(url)s\">%(title)s</" "a>. Sie können zu älteren und neueren Datensätzen blättern." -#: ckanext/odsh/templates/package/read.html:128 +#: ckanext/odsh/templates/package/read.html:127 msgid "latest collection member" msgstr "Neuester Datensatz" -#: ckanext/odsh/templates/package/read.html:133 -#: ckanext/odsh/templates/package/read.html:138 +#: ckanext/odsh/templates/package/read.html:132 +#: ckanext/odsh/templates/package/read.html:137 msgid "predecessor" msgstr "Vorgänger" -#: ckanext/odsh/templates/package/read.html:143 -#: ckanext/odsh/templates/package/read.html:148 +#: ckanext/odsh/templates/package/read.html:142 +#: ckanext/odsh/templates/package/read.html:147 msgid "successor" msgstr "Nachfolger" @@ -1147,15 +1156,36 @@ msgstr "Aktiv" msgid "Applicable Legislation" msgstr "Geltende Rechtsvorschriften" -#: ckanext/odsh/templates/package/snippets/package_form.html:31 +#: ckanext/odsh/templates/package/snippets/package_form.html:8 +msgid "GUID detected" +msgstr "GUID gefunden" + +#: ckanext/odsh/templates/package/snippets/package_form.html:9 +msgid "" +"A GUID was detected in the dataset's extras, suggesting it was likely " +"generated by a harvester. Manual editing is not recommended." +msgstr "" +"Eine GUID wurde in den Zusatzinformationen des Datensatzes erkannt, was " +"darauf hindeutet, dass der Datensatz vermutlich von einem Harvester erstellt " +"wurde. Manuelle Änderungen werden nicht empfohlen." + +#: ckanext/odsh/templates/package/snippets/package_form.html:10 +msgid "" +"Please contact the publisher if you would like to request any changes to the " +"metadata." +msgstr "" +"Bitte wenden Sie sich an den Herausgeber, wenn Sie Änderungen an den " +"Metadaten wünschen." + +#: ckanext/odsh/templates/package/snippets/package_form.html:40 msgid "Are you sure you want to delete this dataset?" msgstr "Sind Sie sicher, dass Sie diesen Datensatz löschen wollen?" -#: ckanext/odsh/templates/package/snippets/package_form.html:37 +#: ckanext/odsh/templates/package/snippets/package_form.html:46 msgid "Next: Add Data" msgstr "Weiter: Daten hinzufügen" -#: ckanext/odsh/templates/package/snippets/package_form.html:44 +#: ckanext/odsh/templates/package/snippets/package_form.html:53 #: ckanext/odsh/templates/package/snippets/resource_form.html:119 msgid "Required information" msgstr "Pflichtangabe" @@ -1619,9 +1649,8 @@ msgstr "Passwort merken" msgid "do Login" msgstr "Einloggen" -#: ckanext/odsh/views/dashboard.py:16 -msgid "Not authorized to see this page" -msgstr "Nicht berechtigt, diese Seite zu sehen" +#~ msgid "Not authorized to see this page" +#~ msgstr "Nicht berechtigt, diese Seite zu sehen" #~ msgid "" #~ "A High-Value Dataset (HVD) category refers to a group of datasets that " diff --git a/ckanext/odsh/templates/package/search.html b/ckanext/odsh/templates/package/search.html index 03a2c78ff267a456af1616af756efbb5216ee846..1673641012d44fc06ac2ce4921f33f37ba842ebf 100644 --- a/ckanext/odsh/templates/package/search.html +++ b/ckanext/odsh/templates/package/search.html @@ -16,7 +16,7 @@ method="get" data-module="select-switch"> <div class="row filter-search-row"> <div class='btn show-filters'><i class="fa fa-filter"></i> {{ _("Filter") }}</div> - {% snippet "snippets/search_box.html"%} + {% snippet "snippets/search_box.html", query=q %} </div> {% endblock %} diff --git a/ckanext/odsh/templates/package/snippets/package_form.html b/ckanext/odsh/templates/package/snippets/package_form.html index 2cb0e5ccc7cf23900bfab39177361d0b5bae822c..9ee68b9549218083a76c6b110e506d0b730c010e 100644 --- a/ckanext/odsh/templates/package/snippets/package_form.html +++ b/ckanext/odsh/templates/package/snippets/package_form.html @@ -2,6 +2,15 @@ {% set action = g.form_action or '' %} {% set form_style = g.form_style or g.action %} + +{% if h.odsh_extract_value_from_extras(data.extras, 'guid') %} +<div class="alert alert-warning" role="alert"> + <h4 class="alert-heading">{{ _('GUID detected') }}</h4> + <p>{{ _('A GUID was detected in the dataset\'s extras, suggesting it was likely generated by a harvester. Manual editing is not recommended.') }}</p> + <p class="mb-0">{{ _('Please contact the publisher if you would like to request any changes to the metadata.') }}</p> +</div> +{% endif %} + <form id="dataset-edit" class="dataset-form {% if(form_style=='edit') %} dataset-edit-form {%endif%} " method="post" action="{{ action }}" data-module="basic-form" novalidate> {{ h.csrf_input() }} diff --git a/setup.py b/setup.py index c591aa58be98e6dd023aeb7eb11385efa483cc17..a9f5931e1f5f5038320c79565c653bb108ea3915 100755 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ setup( # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # http://packaging.python.org/en/latest/tutorial.html#version - version='2.4.3', + version='2.4.4', description='''A general extension for CKAN that is used for the Open Data Schleswig-Holstein project''', long_description=long_description,