Merge branch 'dev-v2.9' into 2.9

CHANGELOG.rst

@@ -9,13 +9,32 @@ Changelog
 
 .. towncrier release notes start
 
+v.2.9.10 2023-12-13
+===================
+
+Bugfixes
+--------
+
+- `CVE-2023-50248 <https://github.com/ckan/ckan/security/advisories/GHSA-7fgc-89cx-w8j5>`_: fix potential
+  out of memory error when submitting the dataset form with a specially-crafted field.
+- Update resource datastore_active with a single statement (`#7833 <https://github.com/ckan/ckan/pull/7833>`_)
+- Fix downloading datastore resources as json with null values in json columns
+  (`#7545 <https://github.com/ckan/ckan/pull/7545>`_)
+- Fix errors when running the `ckan db upgrade` command (`#7681
+  <https://github.com/ckan/ckan/pull/7681>`_)
+- Fix ``deprecated`` decorator (`#7939
+  <https://github.com/ckan/ckan/pull/7939>`_)
+- Changed dataset query to check for ``+state:`` in the ``fq_list`` as well as the
+  `fq` parameter before forcing ``state:active`` (`#7905
+  <https://github.com/ckan/ckan/pull/7905>`_)
+
 v.2.9.9 2023-05-24
 ==================
 
 Bugfixes
 --------
 
-- `CVE-2023-32321 <https://github.com/ckan/ckan/security/advisories/GHSA-446m-hmmm-hm8m>`_: fix 
+- `CVE-2023-32321 <https://github.com/ckan/ckan/security/advisories/GHSA-446m-hmmm-hm8m>`_: fix
   potential path traversal, remote code execution, information disclosure and
   DOS vulnerabilities via crafted resource ids.
 - Names are now quoted in From and To addresses in emails, meaning that site titles with

changes/6713.bugfix

@@ -0,0 +1 @@
+Fix datastore_search + downloading datastore resources as json with null values

changes/7681.misc

@@ -0,0 +1 @@
+Fix errors when running the `ckan db upgrade` command

changes/7905.bugfix

@@ -0,0 +1 @@
+Changed dataset query to check for `+state:` in the `fq_list` as well as the `fq` parameter before forcing `state:active`

ckan/__init__.py

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-__version__ = '2.9.9'
+__version__ = '2.9.10'
 
 __description__ = 'CKAN Software'
 __long_description__ = \

ckan/i18n/am/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -13,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
-"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2020\n"
-"Language-Team: Amharic (https://www.transifex.com/okfn/teams/11162/am/)\n"
+"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2020\n"
+"Language-Team: Amharic (https://app.transifex.com/okfn/teams/11162/am/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

ckan/i18n/ar/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # Abed khooli <abedkhooli@gmail.com>, 2020
 # 
 #, fuzzy
@@ -15,7 +15,7 @@ msgstr ""
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
 "Last-Translator: Abed khooli <abedkhooli@gmail.com>, 2020\n"
-"Language-Team: Arabic (https://www.transifex.com/okfn/teams/11162/ar/)\n"
+"Language-Team: Arabic (https://app.transifex.com/okfn/teams/11162/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

ckan/i18n/bg/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # Daniel C <dansum@gmail.com>, 2021
 # 
 #, fuzzy
@@ -15,7 +15,7 @@ msgstr ""
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
 "Last-Translator: Daniel C <dansum@gmail.com>, 2021\n"
-"Language-Team: Bulgarian (https://www.transifex.com/okfn/teams/11162/bg/)\n"
+"Language-Team: Bulgarian (https://app.transifex.com/okfn/teams/11162/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

ckan/i18n/bs/LC_MESSAGES/ckan.po

@@ -5,7 +5,7 @@
 # 
 # Translators:
 # Emina Biberovic, 2022
-# Željko Kojić <kojicz983@gmail.com>, 2022
+# Željko Kojić <kojicz983@gmail.com>, 2023
 # 
 #, fuzzy
 msgid ""
@@ -14,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
-"Last-Translator: Željko Kojić <kojicz983@gmail.com>, 2022\n"
-"Language-Team: Bosnian (https://www.transifex.com/okfn/teams/11162/bs/)\n"
+"Last-Translator: Željko Kojić <kojicz983@gmail.com>, 2023\n"
+"Language-Team: Bosnian (https://app.transifex.com/okfn/teams/11162/bs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -5108,7 +5108,7 @@ msgstr ""
 
 #: ckanext/reclineview/plugin.py:113
 msgid "Data Explorer"
-msgstr "Data Explorer"
+msgstr "Pretraživač podataka"
 
 #: ckanext/reclineview/plugin.py:185
 #: ckanext/reclineview/theme/public/recline_view.js:204

ckan/i18n/ca/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -13,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
-"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2020\n"
-"Language-Team: Catalan (https://www.transifex.com/okfn/teams/11162/ca/)\n"
+"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2020\n"
+"Language-Team: Catalan (https://app.transifex.com/okfn/teams/11162/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po

@@ -4,8 +4,8 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
-# trendspotter <jirka.p@volny.cz>, 2022
+# Adrià Mercader <amercadero@gmail.com>, 2020
+# Jiří Podhorecký, 2023
 # 
 #, fuzzy
 msgid ""
@@ -14,8 +14,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
-"Last-Translator: trendspotter <jirka.p@volny.cz>, 2022\n"
-"Language-Team: Czech (Czech Republic) (https://www.transifex.com/okfn/teams/11162/cs_CZ/)\n"
+"Last-Translator: Jiří Podhorecký, 2023\n"
+"Language-Team: Czech (Czech Republic) (https://app.transifex.com/okfn/teams/11162/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2259,11 +2259,17 @@ msgid ""
 "password at: %(reset_link)s Have a nice day. -- Message sent by "
 "%(site_title)s (%(site_url)s)"
 msgstr ""
+"Vážený %(user_name)s, byl jste pozván na %(site_title)s. Již pro Vás byl "
+"vytvořen uživatel s uživatelským jménem %(user_name)s. Později si jej můžete"
+" změnit. Byl jste přidán do %(group_type)s %(group_title)ss následující "
+"rolí: %(role_name)s. Chcete-li tuto pozvánku přijmout, změňte prosím své "
+"heslo na adrese :%(reset_link)s Přejeme vám hezký den. -- Zprávu odeslána z "
+"%(site_title)s (%(site_url)s)"
 
 #: ckan/templates/emails/invite_user_subject.txt:1
 #, python-format
 msgid "Invite for %(site_title)s"
-msgstr ""
+msgstr "Pozvánka na %(site_title)s"
 
 #: ckan/templates/emails/reset_password.txt:1
 #, python-format
@@ -2273,6 +2279,9 @@ msgid ""
 "%(reset_link)s Have a nice day. -- Message sent by %(site_title)s "
 "(%(site_url)s)"
 msgstr ""
+"Vážený %(user_name)s , požádal jste o obnovení hesla na %(site_title)s. Pro "
+"potvrzení této žádosti klikněte na následující odkaz: %(reset_link)sPřejeme "
+"vám hezký den. -- Zpráva odeslána z %(site_title)s (%(site_url)s)"
 
 #: ckan/templates/emails/reset_password_subject.txt:1
 #, python-format

ckan/i18n/da_DK/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -13,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
-"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2020\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/okfn/teams/11162/da_DK/)\n"
+"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2020\n"
+"Language-Team: Danish (Denmark) (https://app.transifex.com/okfn/teams/11162/da_DK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

ckan/i18n/de/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # Ondics Githubler, 2022
 # 
 #, fuzzy
@@ -15,7 +15,7 @@ msgstr ""
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
 "Last-Translator: Ondics Githubler, 2022\n"
-"Language-Team: German (https://www.transifex.com/okfn/teams/11162/de/)\n"
+"Language-Team: German (https://app.transifex.com/okfn/teams/11162/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

ckan/i18n/el/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # Yannis Kaskamanidis <kiolalis@gmail.com>, 2020
 # 
 #, fuzzy
@@ -15,7 +15,7 @@ msgstr ""
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
 "Last-Translator: Yannis Kaskamanidis <kiolalis@gmail.com>, 2020\n"
-"Language-Team: Greek (https://www.transifex.com/okfn/teams/11162/el/)\n"
+"Language-Team: Greek (https://app.transifex.com/okfn/teams/11162/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

ckan/i18n/en_AU/LC_MESSAGES/ckan.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2022.
 # 
 # Translators:
-# Adrià Mercader <adria.mercader@okfn.org>, 2020
+# Adrià Mercader <amercadero@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -13,8 +13,8 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2022-11-09 15:55+0100\n"
 "PO-Revision-Date: 2020-07-09 15:07+0000\n"
-"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2020\n"
-"Language-Team: English (Australia) (https://www.transifex.com/okfn/teams/11162/en_AU/)\n"
+"Last-Translator: Adrià Mercader <amercadero@gmail.com>, 2020\n"
+"Language-Team: English (Australia) (https://app.transifex.com/okfn/teams/11162/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"