Merge branch 'dev-v2.8' into 2.8

.circleci/config.yml

@@ -31,13 +31,6 @@ jobs:
       - run: |
           # OS Dependencies
           apt update
-          case $CIRCLE_NODE_INDEX in
-            $NODE_TESTS_CONTAINER)
-            curl -sL https://deb.nodesource.com/setup_10.x | bash -
-            apt install -y nodejs
-            npm install [email protected] phantomjs@~1.9.1
-            ;;
-          esac
           apt install -y postgresql-client solr-jetty openjdk-8-jdk
 
           # Python Dependencies
@@ -77,24 +70,6 @@ jobs:
       - store_test_results:
           path: ~/junit
 
-      # Tests Frontend, only in one container
-      - run:
-          command: |
-            case $CIRCLE_NODE_INDEX in
-              $NODE_TESTS_CONTAINER) paster serve test-core-circle-ci.ini
-              ;;
-            esac
-          background: true
-      - run:
-          command: |
-            case $CIRCLE_NODE_INDEX in
-              $NODE_TESTS_CONTAINER)
-                sleep 5
-                /root/project/node_modules/mocha-phantomjs/bin/mocha-phantomjs \
-                  http://localhost:5000/base/test/index.html
-              ;;
-            esac
-
 workflows:
   version: 2
   build_and_test:

CHANGELOG.rst

@@ -7,6 +7,22 @@
 Changelog
 ---------
 
+
+v.2.8.6 2020-10-21
+==================
+
+Fixes:
+* Allow IAuthenticator methods to return responses (`#5259 <https://github.com/ckan/ckan/pull/5640>`_)
+* Fix skip to content link hiding on screen readers (`#5556 <https://github.com/ckan/ckan/pull/5556>`_)
+* Fix unflattening of dataset extras (`#5602 <https://github.com/ckan/ckan/pull/5611>`_)
+* Fix minified JS files in 2.7 (`#5557 <https://github.com/ckan/ckan/pull/5561>`_)
+* Send the right URL of CKAN to datapusher (`#5281 <https://github.com/ckan/ckan/pull/5281>`_)
+* Fix fullscreen for resource webpageview (`#5552 <https://github.com/ckan/ckan/pull/5552>`_)
+* PackageSearchIndex.index_package(): catch IndexError from date parsing (`#5535 <https://github.com/ckan/ckan/pull/5535>`_)
+* Fix collapsible menu in mobile view (`#5448 <https://github.com/ckan/ckan/pull/5448>`_)
+* Refactor query string parsing module
+
+
 v.2.8.5 2020-08-05
 ==================
 

ckan/__init__.py

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

ckan/config/middleware/flask_app.py

@@ -286,19 +286,29 @@ def get_locale():
 
 
 def ckan_before_request():
-    u'''Common handler executed before all Flask requests'''
+    u'''
+    Common handler executed before all Flask requests
+
+    If a response is returned by any of the functions called (
+    currently ``identify_user()` only) any further processing of the
+    request will be stopped and that response will be returned.
+
+    '''
+    response = None
 
     # Update app_globals
     app_globals.app_globals._check_uptodate()
 
     # Identify the user from the repoze cookie or the API header
     # Sets g.user and g.userobj
-    identify_user()
+    response = identify_user()
 
     # Provide g.controller and g.action for backward compatibility
     # with extensions
     set_controller_and_action()
 
+    return response
+
 
 def ckan_after_request(response):
     u'''Common handler executed after all Flask requests'''

ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po

@@ -6,6 +6,7 @@
 # Translators:
 # Jakub Klímek <[email protected]>, 2018
 # Adrià Mercader <[email protected]>, 2018
+# Jiří Podhorecký, 2020
 # 
 #, fuzzy
 msgid ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
 "POT-Creation-Date: 2020-03-31 17:05+0200\n"
 "PO-Revision-Date: 2018-03-27 14:15+0000\n"
-"Last-Translator: Adrià Mercader <[email protected]>, 2018\n"
+"Last-Translator: Jiří Podhorecký, 2020\n"
 "Language-Team: Czech (Czech Republic) (https://www.transifex.com/okfn/teams/11162/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1478,7 +1479,7 @@ msgstr "Zdroj nebyl nalezen."
 
 #: ckan/logic/action/get.py:1202
 msgid "Parameter is not an bool"
-msgstr ""
+msgstr "Parametr není booleovský"
 
 #: ckan/logic/action/get.py:2051
 msgid "Do not specify if using \"query\" parameter"
@@ -1710,7 +1711,7 @@ msgstr "Uživatel %s není oprávněn aktualizovat tabulku term_translation"
 
 #: ckan/model/license.py:133
 msgid "title"
-msgstr ""
+msgstr "název"
 
 #: ckan/model/license.py:228
 msgid "License not specified"
@@ -2007,7 +2008,7 @@ msgstr "Soubor"
 #: ckan/public/base/javascript/modules/resource-reorder.js:41
 #: ckan/public/base/javascript/modules/resource-reorder.min.js:1
 msgid "Reorder resources"
-msgstr ""
+msgstr "Změnit pořadí zdrojů"
 
 #: ckan/public/base/javascript/modules/resource-reorder.js:42
 #: ckan/public/base/javascript/modules/resource-reorder.min.js:1
@@ -2016,6 +2017,9 @@ msgid ""
 "the resource to the right and place it to the desired location on the list. "
 "When you are done, click the \"Save order\" -button."
 msgstr ""
+"Uspořádání zdrojů můžete změnit jejich přetažením pomocí ikony šipky. "
+"Přetáhněte zdroj doprava a umístěte jej na požadované místo v seznamu. Po "
+"dokončení klikněte na tlačítko „Uložit pořadí“."
 
 #: ckan/public-bs2/base/javascript/modules/resource-reorder.js:56
 #: ckan/public-bs2/base/javascript/modules/resource-view-reorder.js:50
@@ -3068,7 +3072,7 @@ msgstr ""
 
 #: ckan/templates/macros/form.html:233
 msgid "Key"
-msgstr ""
+msgstr "Klíč"
 
 #: ckan/templates/macros/form.html:245
 #: ckan/templates/package/resource_read.html:167
@@ -4422,17 +4426,19 @@ msgstr "Obnovit heslo"
 
 #: ckan/templates/user/request_reset.html:17
 msgid "Email or username"
-msgstr ""
+msgstr "E-mail nebo uživatelské jméno"
 
 #: ckan/templates/user/request_reset.html:22
 msgid "Request Reset"
-msgstr ""
+msgstr "Žádost o reset"
 
 #: ckan/templates/user/request_reset.html:38
 msgid ""
 "Enter your email address or username into the box and we will send you an "
 "email with a link to enter a new password. "
 msgstr ""
+"Do pole zadejte svou e-mailovou adresu nebo uživatelské jméno a my vám "
+"zašleme e-mail s odkazem na zadání nového hesla."
 
 #: ckan/templates/user/snippets/followee_dropdown.html:15
 #: ckan/templates/user/snippets/followee_dropdown.html:16
@@ -4457,19 +4463,22 @@ msgstr "Vyhledat uživatele"
 
 #: ckan/views/user.py:509
 msgid "Email is required"
-msgstr ""
+msgstr "E-mail je vyžadován"
 
 #: ckan/views/user.py:561
 msgid ""
 "Error sending the email. Try again later or contact an administrator for "
 "help"
 msgstr ""
+"Chyba při odesílání e-mailu. Zkuste to znovu později nebo požádejte o pomoc "
+"správce"
 
 #: ckan/views/user.py:569
 msgid ""
 "A reset link has been emailed to you (unless the account specified does not "
 "exist)"
 msgstr ""
+"Byl vám zaslán e-mail s resetovacím odkazem (pokud zadaný účet neexistuje)"
 
 #: ckan/views/user.py:611
 msgid "Your password must be 8 characters or longer."
@@ -4998,7 +5007,7 @@ msgstr "Text"
 #: ckanext/textview/theme/public/text_view.js:70
 #: ckanext/textview/theme/public/text_view.min.js:3
 msgid "An error occured during AJAX request. Could not load view."
-msgstr ""
+msgstr "Během požadavku AJAX došlo k chybě. Nelze načíst pohled."
 
 #: ckanext/webpageview/plugin.py:22 ckanext/webpageview/plugin.py:27
 msgid "Website"