From fb24c8444ab389967596fda626f76e28bb7812ff Mon Sep 17 00:00:00 2001
From: Jari Voutilainen <jari.voutilainen@iki.fi>
Date: Tue, 31 Jul 2018 09:47:43 +0300
Subject: [PATCH 01/14] Explicitly set default search field in search as schema
 based default field is deprecated in solr

---
 ckan/lib/search/query.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ckan/lib/search/query.py b/ckan/lib/search/query.py
index 19e26ff1877..e7ddfdcb934 100644
--- a/ckan/lib/search/query.py
+++ b/ckan/lib/search/query.py
@@ -311,6 +311,9 @@ def run(self, query, permission_labels=None, **kwargs):
         if not q or q == '""' or q == "''":
             query['q'] = "*:*"
 
+        # Set default search field
+        query['df'] = 'text'
+        
         # number of results
         rows_to_return = min(1000, int(query.get('rows', 10)))
         if rows_to_return > 0:

From 89cb5097062ac9a286f7b225d992a57cdaa721c8 Mon Sep 17 00:00:00 2001
From: Jari Voutilainen <jari.voutilainen@iki.fi>
Date: Thu, 2 Aug 2018 16:23:40 +0300
Subject: [PATCH 02/14] Set default search field before before_search and
 expose it to search itself

---
 ckan/lib/search/query.py | 5 +----
 ckan/logic/action/get.py | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckan/lib/search/query.py b/ckan/lib/search/query.py
index e7ddfdcb934..599125bbe54 100644
--- a/ckan/lib/search/query.py
+++ b/ckan/lib/search/query.py
@@ -20,7 +20,7 @@
 VALID_SOLR_PARAMETERS = set([
     'q', 'fl', 'fq', 'rows', 'sort', 'start', 'wt', 'qf', 'bf', 'boost',
     'facet', 'facet.mincount', 'facet.limit', 'facet.field',
-    'extras', 'fq_list', 'tie', 'defType', 'mm'
+    'extras', 'fq_list', 'tie', 'defType', 'mm', 'df'
 ])
 
 # for (solr) package searches, this specifies the fields that are searched
@@ -311,9 +311,6 @@ def run(self, query, permission_labels=None, **kwargs):
         if not q or q == '""' or q == "''":
             query['q'] = "*:*"
 
-        # Set default search field
-        query['df'] = 'text'
-        
         # number of results
         rows_to_return = min(1000, int(query.get('rows', 10)))
         if rows_to_return > 0:
diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
index 7c4cd02a453..563346994da 100644
--- a/ckan/logic/action/get.py
+++ b/ckan/logic/action/get.py
@@ -1814,6 +1814,9 @@ def package_search(context, data_dict):
     for key in [key for key in data_dict.keys() if key.startswith('ext_')]:
         data_dict['extras'][key] = data_dict.pop(key)
 
+    # set default search field
+    data_dict.setdefault('df', 'text')
+
     # check if some extension needs to modify the search params
     for item in plugins.PluginImplementations(plugins.IPackageController):
         data_dict = item.before_search(data_dict)

From 5373525f6a18f3a7922eaf5d50fbeeaae937d7be Mon Sep 17 00:00:00 2001
From: Jari Voutilainen <jari.voutilainen@iki.fi>
Date: Fri, 3 Aug 2018 08:56:10 +0300
Subject: [PATCH 03/14] Set df parameter so that it can't be manipulated from
 the api

---
 ckan/logic/action/get.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
index 563346994da..07a7e2aec0e 100644
--- a/ckan/logic/action/get.py
+++ b/ckan/logic/action/get.py
@@ -1815,7 +1815,7 @@ def package_search(context, data_dict):
         data_dict['extras'][key] = data_dict.pop(key)
 
     # set default search field
-    data_dict.setdefault('df', 'text')
+    data_dict['df'] = 'text'
 
     # check if some extension needs to modify the search params
     for item in plugins.PluginImplementations(plugins.IPackageController):

From 56fb0b19db735c4583309fe1e9fdc8eb06364189 Mon Sep 17 00:00:00 2001
From: Dusko Bogdanovski <dusko.bogdanovski@keitaro.com>
Date: Wed, 15 Aug 2018 13:48:39 +0200
Subject: [PATCH 04/14] [#4401] Fix for comparing the current with the chosen
 language

---
 ckan/templates/snippets/language_selector.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckan/templates/snippets/language_selector.html b/ckan/templates/snippets/language_selector.html
index bdea7b2ad9e..a092949b349 100644
--- a/ckan/templates/snippets/language_selector.html
+++ b/ckan/templates/snippets/language_selector.html
@@ -3,7 +3,7 @@
   <label for="field-lang-select">{{ _('Language') }}</label>
   <select id="field-lang-select" name="url" data-module="autocomplete" data-module-dropdown-class="lang-dropdown" data-module-container-class="lang-container">
     {% for locale in h.get_available_locales() %}
-      <option value="{% url_for h.current_url(), locale=locale.short_name %}" {% if locale.identifier == current_lang %}selected="selected"{% endif %}>
+      <option value="{% url_for h.current_url(), locale=locale.short_name %}" {% if locale.short_name == current_lang %}selected="selected"{% endif %}>
         {{ locale.display_name or locale.english_name }}
       </option>
     {% endfor %}

From ca9df3661e8f23e30e3de10f250026bc6f070120 Mon Sep 17 00:00:00 2001
From: Ian Ward <ian@excess.org>
Date: Thu, 16 Aug 2018 15:35:16 -0400
Subject: [PATCH 05/14] [#4407] datastore_upsert: new dry_run parameter

---
 ckanext/datastore/backend/postgres.py  |  5 +-
 ckanext/datastore/logic/action.py      |  3 +
 ckanext/datastore/logic/schema.py      |  1 +
 ckanext/datastore/tests/test_upsert.py | 84 +++++++++++++++++++++++---
 4 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/ckanext/datastore/backend/postgres.py b/ckanext/datastore/backend/postgres.py
index ccb179ce39a..d5efe957a95 100644
--- a/ckanext/datastore/backend/postgres.py
+++ b/ckanext/datastore/backend/postgres.py
@@ -1412,7 +1412,10 @@ def upsert(context, data_dict):
         context['connection'].execute(
             u'SET LOCAL statement_timeout TO {0}'.format(timeout))
         upsert_data(context, data_dict)
-        trans.commit()
+        if data_dict.get(u'dry_run', False):
+            trans.rollback()
+        else:
+            trans.commit()
         return _unrename_json_field(data_dict)
     except IntegrityError as e:
         if e.orig.pgcode == _PG_ERR_CODE['unique_violation']:
diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py
index 7ec5066f7b0..0c91b0f1057 100644
--- a/ckanext/datastore/logic/action.py
+++ b/ckanext/datastore/logic/action.py
@@ -229,6 +229,9 @@ def datastore_upsert(context, data_dict):
                    Possible options are: upsert, insert, update
                    (optional, default: upsert)
     :type method: string
+    :param dry_run: set to True to abort transaction instead of committing,
+                    e.g. to check for validation or type errors.
+    :type dry_run: bool (optional, default: False)
 
     **Results:**
 
diff --git a/ckanext/datastore/logic/schema.py b/ckanext/datastore/logic/schema.py
index 65e1f3d9847..c9b221d9f42 100644
--- a/ckanext/datastore/logic/schema.py
+++ b/ckanext/datastore/logic/schema.py
@@ -135,6 +135,7 @@ def datastore_upsert_schema():
         'id': [ignore_missing],
         'method': [ignore_missing, text_type, OneOf(
             ['upsert', 'insert', 'update'])],
+        'dry_run': [ignore_missing, boolean_validator],
         '__junk': [empty],
         '__before': [rename('id', 'resource_id')]
     }
diff --git a/ckanext/datastore/tests/test_upsert.py b/ckanext/datastore/tests/test_upsert.py
index d58ec7bd4ae..57e56160587 100644
--- a/ckanext/datastore/tests/test_upsert.py
+++ b/ckanext/datastore/tests/test_upsert.py
@@ -12,6 +12,7 @@
 import ckan.tests.legacy as tests
 import ckan.tests.helpers as helpers
 import ckan.tests.factories as factories
+from ckan.plugins.toolkit import ValidationError
 
 from ckan.common import config
 
@@ -22,7 +23,7 @@
 assert_equal = nose.tools.assert_equal
 
 
-class TestDatastoreUpsertNewTests(DatastoreFunctionalTestBase):
+class TestDatastoreUpsert(DatastoreFunctionalTestBase):
     def test_upsert_doesnt_crash_with_json_field(self):
         resource = factories.Resource()
         data = {
@@ -67,15 +68,82 @@ def test_upsert_doesnt_crash_with_json_field_with_string_value(self):
         }
         helpers.call_action('datastore_upsert', **data)
 
-
-class TestDatastoreUpsert(DatastoreLegacyTestBase):
+    def test_dry_run(self):
+        ds = factories.Dataset()
+        table = helpers.call_action(
+            u'datastore_create',
+            resource={u'package_id': ds['id']},
+            fields=[{u'id': u'spam', u'type': u'text'}],
+            primary_key=u'spam')
+        helpers.call_action(
+            u'datastore_upsert',
+            resource_id=table['resource_id'],
+            records=[{u'spam': u'SPAM'}, {u'spam': u'EGGS'}],
+            dry_run=True)
+        result = helpers.call_action(
+            u'datastore_search',
+            resource_id=table['resource_id'])
+        assert_equal(result['records'], [])
+
+    def test_dry_run_type_error(self):
+        ds = factories.Dataset()
+        table = helpers.call_action(
+            u'datastore_create',
+            resource={u'package_id': ds['id']},
+            fields=[{u'id': u'spam', u'type': u'numeric'}],
+            primary_key=u'spam')
+        try:
+            helpers.call_action(
+                u'datastore_upsert',
+                resource_id=table['resource_id'],
+                records=[{u'spam': u'SPAM'}, {u'spam': u'EGGS'}],
+                dry_run=True)
+        except ValidationError as ve:
+            assert_equal(ve.error_dict['records'],
+                [u'invalid input syntax for type numeric: "SPAM"'])
+        else:
+            assert 0, 'error not raised'
+
+    def test_dry_run_trigger_error(self):
+        ds = factories.Dataset()
+        helpers.call_action(
+            u'datastore_function_create',
+            name=u'spamexception_trigger',
+            rettype=u'trigger',
+            definition=u'''
+                BEGIN
+                IF NEW.spam != 'spam' THEN
+                    RAISE EXCEPTION '"%"? Yeeeeccch!', NEW.spam;
+                END IF;
+                RETURN NEW;
+                END;''')
+        table = helpers.call_action(
+            u'datastore_create',
+            resource={u'package_id': ds['id']},
+            fields=[{u'id': u'spam', u'type': u'text'}],
+            primary_key=u'spam',
+            triggers=[{u'function': u'spamexception_trigger'}])
+        try:
+            helpers.call_action(
+                u'datastore_upsert',
+                resource_id=table['resource_id'],
+                records=[{u'spam': u'EGGS'}],
+                dry_run=True)
+        except ValidationError as ve:
+            assert_equal(ve.error_dict['records'],
+                [u'"EGGS"? Yeeeeccch!'])
+        else:
+            assert 0, 'error not raised'
+
+
+class TestDatastoreUpsertLegacyTests(DatastoreLegacyTestBase):
     sysadmin_user = None
     normal_user = None
 
     @classmethod
     def setup_class(cls):
         cls.app = helpers._get_test_app()
-        super(TestDatastoreUpsert, cls).setup_class()
+        super(TestDatastoreUpsertLegacyTests, cls).setup_class()
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
@@ -313,14 +381,14 @@ def test_upsert_works_with_empty_list_in_json_field(self):
 
 
 
-class TestDatastoreInsert(DatastoreLegacyTestBase):
+class TestDatastoreInsertLegacyTests(DatastoreLegacyTestBase):
     sysadmin_user = None
     normal_user = None
 
     @classmethod
     def setup_class(cls):
         cls.app = helpers._get_test_app()
-        super(TestDatastoreInsert, cls).setup_class()
+        super(TestDatastoreInsertLegacyTests, cls).setup_class()
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')
@@ -408,14 +476,14 @@ def test_insert_basic(self):
         assert results.rowcount == 3
 
 
-class TestDatastoreUpdate(DatastoreLegacyTestBase):
+class TestDatastoreUpdateLegacyTests(DatastoreLegacyTestBase):
     sysadmin_user = None
     normal_user = None
 
     @classmethod
     def setup_class(cls):
         cls.app = helpers._get_test_app()
-        super(TestDatastoreUpdate, cls).setup_class()
+        super(TestDatastoreUpdateLegacyTests, cls).setup_class()
         ctd.CreateTestData.create()
         cls.sysadmin_user = model.User.get('testsysadmin')
         cls.normal_user = model.User.get('annafan')

From 46724dc6714a5c978260603c4789dfbea1b44709 Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Fri, 17 Aug 2018 11:14:34 +0100
Subject: [PATCH 06/14] [#4392] Upgrade pyfakefs to avoid pbr conflict over
 mox3.

---
 dev-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 56555a8b31a..2a7fdc4e163 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -9,7 +9,7 @@ httpretty==0.8.3
 mock==2.0.0
 pycodestyle==2.2.0
 pip-tools==1.7.0
-pyfakefs==2.9
+pyfakefs==3.2
 Sphinx==1.7.5
 sphinx-rtd-theme==0.3.1
 

From e93f365d61466ef7192a1b3f40a3dcfea47dd537 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Tue, 21 Aug 2018 11:37:09 +0200
Subject: [PATCH 07/14] Don't re-register plugin helpers on flask_app, as it
 has been done on load_environment

---
 ckan/config/middleware/flask_app.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
index 7edb1de929d..8a6d6184685 100644
--- a/ckan/config/middleware/flask_app.py
+++ b/ckan/config/middleware/flask_app.py
@@ -308,7 +308,8 @@ def ckan_after_request(response):
 
 def helper_functions():
     u'''Make helper functions (`h`) available to Flask templates'''
-    helpers.load_plugin_helpers()
+    if not helpers.helper_functions:
+        helpers.load_plugin_helpers()
     return dict(h=helpers.helper_functions)
 
 

From ac199f441e8bf7afbf2790ba39e9860e22e1ea36 Mon Sep 17 00:00:00 2001
From: Ori Hoch <ori@uumpa.com>
Date: Thu, 23 Aug 2018 22:18:45 +0300
Subject: [PATCH 08/14] autocomplete.js: fix handling of comma key codes

---
 .../base/javascript/modules/autocomplete.js      |  2 +-
 .../base/test/spec/modules/autocomplete.spec.js  | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ckan/public/base/javascript/modules/autocomplete.js b/ckan/public/base/javascript/modules/autocomplete.js
index 562854a7afe..a77a9d2736c 100644
--- a/ckan/public/base/javascript/modules/autocomplete.js
+++ b/ckan/public/base/javascript/modules/autocomplete.js
@@ -266,7 +266,7 @@ this.ckan.module('autocomplete', function (jQuery) {
      * Returns nothing.
      */
     _onKeydown: function (event) {
-      if (event.which === 188) {
+      if (typeof event.key !== 'undefined' ? event.key === ',' : event.which === 188) {
         event.preventDefault();
         setTimeout(function () {
           var e = jQuery.Event("keydown", { which: 13 });
diff --git a/ckan/public/base/test/spec/modules/autocomplete.spec.js b/ckan/public/base/test/spec/modules/autocomplete.spec.js
index 9e8fffa0469..ea1807c0e16 100644
--- a/ckan/public/base/test/spec/modules/autocomplete.spec.js
+++ b/ckan/public/base/test/spec/modules/autocomplete.spec.js
@@ -280,7 +280,7 @@ describe('ckan.modules.AutocompleteModule()', function () {
 
   describe('._onKeydown(event)', function () {
     beforeEach(function () {
-      this.keyDownEvent = jQuery.Event("keydown", { which: 188 });
+      this.keyDownEvent = jQuery.Event("keydown", { key: ',', which: 188 });
       this.fakeEvent = {};
       this.clock = sinon.useFakeTimers();
       this.jQuery = sinon.stub(jQuery.fn, 'init', jQuery.fn.init);
@@ -294,7 +294,7 @@ describe('ckan.modules.AutocompleteModule()', function () {
       this.Event.restore();
       this.trigger.restore();
     });
-  
+
     it('should trigger fake "return" keypress if a comma is pressed', function () {
       this.module._onKeydown(this.keyDownEvent);
 
@@ -307,6 +307,7 @@ describe('ckan.modules.AutocompleteModule()', function () {
     });
 
     it('should do nothing if another key is pressed', function () {
+      this.keyDownEvent.key = '╚';
       this.keyDownEvent.which = 200;
 
       this.module._onKeydown(this.keyDownEvent);
@@ -315,5 +316,16 @@ describe('ckan.modules.AutocompleteModule()', function () {
 
       assert.notCalled(this.Event);
     });
+
+    it('should do nothing if key is pressed which has the comma key-code but is not a comma', function () {
+      this.keyDownEvent.key = 'ת';
+      this.keyDownEvent.which = 188;
+
+      this.module._onKeydown(this.keyDownEvent);
+
+      this.clock.tick(100);
+
+      assert.notCalled(this.Event);
+    });
   });
 });

From 6f15cfb1cc913d73b029d5515dd0375e979d79a2 Mon Sep 17 00:00:00 2001
From: Ori Hoch <ori@uumpa.com>
Date: Fri, 24 Aug 2018 10:20:21 +0300
Subject: [PATCH 09/14] support overriding resources, using fanstatic rollup /
 supersedes feature

---
 ckan/config/middleware/flask_app.py     |  4 ++++
 ckan/config/middleware/pylons_app.py    |  4 ++++
 ckan/lib/fanstatic_resources.py         | 15 +++++++++++++--
 doc/contributing/frontend/resources.rst | 11 +++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
index 8a6d6184685..4293d82b378 100644
--- a/ckan/config/middleware/flask_app.py
+++ b/ckan/config/middleware/flask_app.py
@@ -206,6 +206,8 @@ def hello_world_post():
         app = plugin.make_middleware(app, config)
 
     # Fanstatic
+    fanstatic_enable_rollup = asbool(app_conf.get('fanstatic_enable_rollup',
+                                                  False))
     if debug:
         fanstatic_config = {
             'versioning': True,
@@ -213,6 +215,7 @@ def hello_world_post():
             'minified': False,
             'bottom': True,
             'bundle': False,
+            'rollup': fanstatic_enable_rollup,
         }
     else:
         fanstatic_config = {
@@ -221,6 +224,7 @@ def hello_world_post():
             'minified': True,
             'bottom': True,
             'bundle': True,
+            'rollup': fanstatic_enable_rollup,
         }
     root_path = config.get('ckan.root_path', None)
     if root_path:
diff --git a/ckan/config/middleware/pylons_app.py b/ckan/config/middleware/pylons_app.py
index 2d352324101..73b714509a7 100644
--- a/ckan/config/middleware/pylons_app.py
+++ b/ckan/config/middleware/pylons_app.py
@@ -75,6 +75,8 @@ def make_pylons_stack(conf, full_stack=True, static_files=True,
                                     cleanup_pylons_response_string)
 
     # Fanstatic
+    fanstatic_enable_rollup = asbool(app_conf.get('fanstatic_enable_rollup',
+                                                  False))
     if asbool(config.get('debug', False)):
         fanstatic_config = {
             'versioning': True,
@@ -82,6 +84,7 @@ def make_pylons_stack(conf, full_stack=True, static_files=True,
             'minified': False,
             'bottom': True,
             'bundle': False,
+            'rollup': fanstatic_enable_rollup,
         }
     else:
         fanstatic_config = {
@@ -90,6 +93,7 @@ def make_pylons_stack(conf, full_stack=True, static_files=True,
             'minified': True,
             'bottom': True,
             'bundle': True,
+            'rollup': fanstatic_enable_rollup,
         }
     root_path = config.get('ckan.root_path', None)
     if root_path:
diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
index aa010be9495..a0d4ad9e7a6 100644
--- a/ckan/lib/fanstatic_resources.py
+++ b/ckan/lib/fanstatic_resources.py
@@ -38,7 +38,7 @@ def get_resource(lib_name, resource_name):
             res = getattr(module, '%s' % resource_name)
         return res
 
-    def create_resource(path, lib_name, count, inline=False):
+    def create_resource(path, lib_name, count, inline=False, supersedes=None):
         ''' create the fanstatic Resource '''
         renderer = None
         kw = {}
@@ -83,6 +83,12 @@ def create_resource(path, lib_name, count, inline=False):
                 script=inline,
                 renderer=renderer,
                 other_browsers=other_browsers)
+        if supersedes:
+            superseded_library, superseded_resource_path = supersedes
+            for _library in get_library_registry().values():
+                if _library.name == superseded_library:
+                    kw['supersedes'] = [_library.known_resources[superseded_resource_path]]
+                    break
         resource = Resource(library, path, **kw)
 
         # Add our customised ordering
@@ -116,6 +122,7 @@ def create_resource(path, lib_name, count, inline=False):
     IE_conditionals = {}
     custom_render_order = {}
     inline_scripts = {}
+    supersedes = {}
 
     # parse the resource.config file if it exists
     config_path = os.path.join(resource_path, 'resource.config')
@@ -150,6 +157,9 @@ def create_resource(path, lib_name, count, inline=False):
                     if f not in IE_conditionals:
                         IE_conditionals[f] = []
                     IE_conditionals[f].append(n)
+        if config.has_section('supersedes'):
+            items = config.items('supersedes')
+            supersedes = dict((n, v.split('/', 1)) for (n, v) in items)
 
     # add dependencies for resources in groups
     for group in groups:
@@ -210,7 +220,8 @@ def create_resource(path, lib_name, count, inline=False):
             inline = inline_scripts[resource_name].strip()
         else:
             inline = None
-        create_resource(resource_name, name, count, inline=inline)
+        create_resource(resource_name, name, count, inline=inline,
+                        supersedes=supersedes.get(resource_name))
         count += 1
 
     # add groups
diff --git a/doc/contributing/frontend/resources.rst b/doc/contributing/frontend/resources.rst
index 5abff1b4626..eb93fad8ef1 100644
--- a/doc/contributing/frontend/resources.rst
+++ b/doc/contributing/frontend/resources.rst
@@ -111,6 +111,11 @@ the same as for the .ini config file.
         bootstrap/js/bootstrap-button.js
         font-awesome/css/font-awesome-ie7.css
 
+    [supersedes]
+
+    select2-upgraded.js = vendor/select2/select2.js
+
+
 
 [main]
 ~~~~~~
@@ -187,3 +192,9 @@ used.
 
 Groups can be referred to in many places in the
 resource.config file eg. [depends]
+
+[supersedes]
+~~~~~~~~~~~~
+
+Allows to override static files from other resources. Has to be enabled at the
+app config by setting fanstatic_enable_rollup = yes

From 5787c7b1a6ff0060987517cf47cbe9c7f4b1171d Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Fri, 24 Aug 2018 11:39:49 +0100
Subject: [PATCH 10/14] Flask patch update

---
 requirements.in  | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.in b/requirements.in
index 934686f928a..4d45a9859f4 100644
--- a/requirements.in
+++ b/requirements.in
@@ -4,7 +4,7 @@ Babel==2.3.4
 bleach==2.1.3
 click==6.7
 fanstatic==0.12
-Flask==0.12.2
+Flask==0.12.4
 Flask-Babel==0.11.2
 Jinja2==2.8
 Markdown==2.6.7
diff --git a/requirements.txt b/requirements.txt
index bbedbd8e940..066c867e117 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ click==6.7
 decorator==4.2.1          # via pylons, sqlalchemy-migrate
 fanstatic==0.12
 Flask-Babel==0.11.2
-Flask==0.12.2             # via flask-babel
+Flask==0.12.4             # via flask-babel
 FormEncode==1.3.1         # via pylons
 funcsigs==1.0.2           # via beaker
 html5lib==1.0.1           # via bleach

From b30a7059227a82d51ca994a73b8ac6a6e522e935 Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Fri, 24 Aug 2018 11:56:33 +0100
Subject: [PATCH 11/14] Upgrade pip-tools so that pip-compile works with latest
 pip version (18.0). Rerun pip-compile (cosmetic differences only in
 requirements.txt)

---
 dev-requirements.txt |  2 +-
 requirements.txt     | 48 ++++++++++++++++++++------------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/dev-requirements.txt b/dev-requirements.txt
index 2a7fdc4e163..f231be1ee67 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -8,7 +8,7 @@ Flask-DebugToolbar==0.10.1
 httpretty==0.8.3
 mock==2.0.0
 pycodestyle==2.2.0
-pip-tools==1.7.0
+pip-tools==2.0.2
 pyfakefs==3.2
 Sphinx==1.7.5
 sphinx-rtd-theme==0.3.1
diff --git a/requirements.txt b/requirements.txt
index bbedbd8e940..6a0c1f3b7ef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,34 +5,34 @@
 #    pip-compile --output-file requirements.txt requirements.in
 #
 argparse==1.4.0           # via ofs
-Babel==2.3.4              # via flask-babel
-Beaker==1.9.0             # via pylons
+babel==2.3.4
+beaker==1.9.0             # via pylons
 bleach==2.1.3
 click==6.7
 decorator==4.2.1          # via pylons, sqlalchemy-migrate
 fanstatic==0.12
-Flask-Babel==0.11.2
-Flask==0.12.2             # via flask-babel
-FormEncode==1.3.1         # via pylons
+flask-babel==0.11.2
+flask==0.12.2
+formencode==1.3.1         # via pylons
 funcsigs==1.0.2           # via beaker
 html5lib==1.0.1           # via bleach
 itsdangerous==0.24        # via flask
-Jinja2==2.8               # via flask, flask-babel
-Mako==1.0.7               # via pylons
-Markdown==2.6.7
-MarkupSafe==1.0           # via jinja2, mako, webhelpers
+jinja2==2.8
+mako==1.0.7               # via pylons
+markdown==2.6.7
+markupsafe==1.0           # via jinja2, mako, webhelpers
 nose==1.3.7               # via pylons
 ofs==0.4.2
-Pairtree==0.7.1-T
+pairtree==0.7.1-t
 passlib==1.6.5
 paste==1.7.5.1
-PasteDeploy==1.5.2        # via pastescript, pylons
-PasteScript==2.0.2        # via pylons
+pastedeploy==1.5.2        # via pastescript, pylons
+pastescript==2.0.2        # via pylons
 pbr==1.10.0               # via sqlalchemy-migrate
 polib==1.0.7
 psycopg2==2.7.3.2
-Pygments==2.2.0           # via weberror
-Pylons==0.9.7
+pygments==2.2.0           # via weberror
+pylons==0.9.7
 pysolr==3.6.0
 python-dateutil==1.5
 python-magic==0.4.15
@@ -43,25 +43,21 @@ repoze.lru==0.7           # via routes
 repoze.who-friendlyform==1.0.8
 repoze.who==2.3
 requests==2.11.1
-Routes==1.13              # via pylons
+routes==1.13
 rq==0.6.0
 simplejson==3.10.0
 six==1.11.0               # via bleach, html5lib, pastescript, pyutilib.component.core, sqlalchemy-migrate
 sqlalchemy-migrate==0.10.0
-SQLAlchemy==1.1.11        # via sqlalchemy-migrate
+sqlalchemy==1.1.11
 sqlparse==0.2.2
-Tempita==0.5.2            # via pylons, sqlalchemy-migrate, weberror
+tempita==0.5.2            # via pylons, sqlalchemy-migrate, weberror
 tzlocal==1.3
 unicodecsv==0.14.1
 vdm==0.14
 webencodings==0.5.1       # via html5lib
-WebError==0.13.1          # via pylons
-WebHelpers==1.3           # via pylons
-WebOb==1.0.8              # via fanstatic, pylons, repoze.who, repoze.who-friendlyform, weberror, webtest
-WebTest==1.4.3            # via pylons
-Werkzeug==0.14.1          # via flask
+weberror==0.13.1          # via pylons
+webhelpers==1.3
+webob==1.0.8
+webtest==1.4.3
+werkzeug==0.14.1          # via flask
 zope.interface==4.3.2
-
-# The following packages are commented out because they are
-# considered to be unsafe in a requirements file:
-# setuptools                # via repoze.who, zope.interface

From 3372892a1e58093927a9e3e3bf7da0393a3e4390 Mon Sep 17 00:00:00 2001
From: David Read <david.read@hackneyworkshop.com>
Date: Fri, 24 Aug 2018 12:43:44 +0100
Subject: [PATCH 12/14] Remove duplicate (see 2 lines later)

---
 CHANGELOG.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9500a4bd21e..0c7a4dc2399 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -172,8 +172,6 @@ Changes and deprecations:
  * The old Celery based background jobs have been removed in CKAN 2.8 in favour of the new RQ based
    jobs (http://docs.ckan.org/en/latest/maintaining/background-tasks.html). Extensions can still
    of course use Celery but they will need to handle the management themselves.
- * `ckan.recaptcha.version` config option is removed, since v2 is the only valid
-    version now (#4061)
  * After introducing dataset blueprint, `h.get_facet_items_dict` takes search_facets as second argument.
    This change is aimed to reduce usage of global variables in context. For a while, it has default value
    of None, in which case, `c.search_facets` will be used. But all template designers are strongly advised

From 59e7951d77443cec0612caa2625e339a1724a2b0 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Fri, 24 Aug 2018 16:34:10 +0200
Subject: [PATCH 13/14] Fix return_id_only behaviour broken by #4315

---
 ckan/logic/action/create.py            |  2 +-
 ckan/tests/logic/action/test_create.py | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py
index b21e800d964..fdae3173645 100644
--- a/ckan/logic/action/create.py
+++ b/ckan/logic/action/create.py
@@ -227,7 +227,7 @@ def package_create(context, data_dict):
     return_id_only = context.get('return_id_only', False)
 
     if return_id_only:
-        return context['id']
+        return pkg.id
 
     return _get_action('package_show')(
                 context.copy(), {'id': pkg.id}
diff --git a/ckan/tests/logic/action/test_create.py b/ckan/tests/logic/action/test_create.py
index 8fed5e42da2..caec376591b 100644
--- a/ckan/tests/logic/action/test_create.py
+++ b/ckan/tests/logic/action/test_create.py
@@ -5,6 +5,8 @@
 '''
 import __builtin__ as builtins
 
+import six
+
 import ckan
 import ckan.logic as logic
 import ckan.model as model
@@ -982,6 +984,15 @@ def test_tags(self):
                             for tag_dict in dataset['tags']])
         assert_equals(tag_names, ['russian', 'tolstoy'])
 
+    def test_return_id_only(self):
+        dataset = helpers.call_action(
+            'package_create',
+            name='test-id',
+            context={'return_id_only': True},
+        )
+
+        assert isinstance(dataset, six.string_types)
+
 
 class TestGroupCreate(helpers.FunctionalTestBase):
 

From 1898066a855ce1fdfd27a37fdfeba9b0daa22fbc Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Fri, 24 Aug 2018 16:38:19 +0200
Subject: [PATCH 14/14] Add return_id_only test for update too

---
 ckan/tests/logic/action/test_update.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/ckan/tests/logic/action/test_update.py b/ckan/tests/logic/action/test_update.py
index ef677f4588e..95372b84878 100644
--- a/ckan/tests/logic/action/test_update.py
+++ b/ckan/tests/logic/action/test_update.py
@@ -652,6 +652,20 @@ def test_tags(self):
                             for tag_dict in dataset_['tags']])
         assert_equals(tag_names, ['russian', 'tolstoy'])
 
+    def test_return_id_only(self):
+        user = factories.User()
+        dataset = factories.Dataset(
+            user=user)
+
+        updated_dataset = helpers.call_action(
+            'package_update',
+            id=dataset['id'],
+            notes='Test',
+            context={'return_id_only': True},
+        )
+
+        assert_equals(updated_dataset, dataset['id'])
+
 
 class TestUpdateSendEmailNotifications(object):
     @classmethod