From 9f0ff9d64d364440105e00e0ebdf348054b6ef54 Mon Sep 17 00:00:00 2001 From: tobes Date: Wed, 20 Mar 2013 17:24:29 +0000 Subject: [PATCH] [#606] Fix no resource error to not me flash message --- ckan/controllers/package.py | 13 ++++++++++--- ckan/lib/app_globals.py | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index 00cc0b09a37..8ae03c1094a 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -611,9 +611,16 @@ def new_resource(self, id, data=None, errors=None, error_summary=None): abort(401, _('Unauthorized to update dataset')) if not len(data_dict['resources']): # no data so keep on page - h.flash_error(_('You must add at least one data resource')) - redirect(h.url_for(controller='package', - action='new_resource', id=id)) + msg = _('You must add at least one data resource') + # On new templates do not use flash message + if g.legacy_templates: + h.flash_error(msg) + redirect(h.url_for(controller='package', + action='new_resource', id=id)) + else: + errors = {} + error_summary = {_('Error'): msg} + return self.new_resource(id, data, errors, error_summary) # we have a resource so let them add metadata redirect(h.url_for(controller='package', action='new_metadata', id=id)) diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py index e98f975ca7d..ce32ca74505 100644 --- a/ckan/lib/app_globals.py +++ b/ckan/lib/app_globals.py @@ -57,6 +57,7 @@ 'openid_enabled': {'default': 'true', 'type' : 'bool'}, 'debug': {'default': 'false', 'type' : 'bool'}, 'ckan.debug_supress_header' : {'default': 'false', 'type' : 'bool'}, + 'ckan.legacy_templates' : {'default': 'false', 'type' : 'bool'}, # int 'ckan.datasets_per_page': {'default': '20', 'type': 'int'},