From c20dd8bc2653cc8afc21eccce85420be72e474a6 Mon Sep 17 00:00:00 2001 From: amercader Date: Fri, 10 Jan 2020 18:21:12 +0100 Subject: [PATCH] [#5152] Use data to pass the previous_upload var Otherwise when using errors it is shown on the error summary on top when using scheming --- ckan/templates/package/snippets/resource_form.html | 2 +- ckan/views/resource.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ckan/templates/package/snippets/resource_form.html b/ckan/templates/package/snippets/resource_form.html index bf7a917e194..48e82cff523 100644 --- a/ckan/templates/package/snippets/resource_form.html +++ b/ckan/templates/package/snippets/resource_form.html @@ -24,7 +24,7 @@ {{ form.image_upload(data, errors, field_url='url', field_upload='upload', field_clear='clear_upload', is_upload_enabled=h.uploads_enabled(), is_url=data.url and not is_upload, is_upload=is_upload, upload_label=_('Data'), url_label=_('URL'), placeholder=_('http://example.com/external-data.csv'), field_name='name', - previous_upload=(errors['previous_upload'] == True) + previous_upload=(data['previous_upload'] == True) ) }} {% endblock %} diff --git a/ckan/views/resource.py b/ckan/views/resource.py index a2f141212fd..274a648d8b6 100644 --- a/ckan/views/resource.py +++ b/ckan/views/resource.py @@ -246,7 +246,7 @@ def post(self, package_type, id): if data.get(u'url_type') == u'upload' and data.get(u'url'): data[u'url'] = u'' data[u'url_type'] = u'' - errors[u'previous_upload'] = True + data[u'previous_upload'] = True return self.get(package_type, id, data, errors, error_summary) except NotAuthorized: return base.abort(403, _(u'Unauthorized to create a resource'))