diff --git a/ckanext/privatedatasets/actions.py b/ckanext/privatedatasets/actions.py index e839395..ce60f73 100644 --- a/ckanext/privatedatasets/actions.py +++ b/ckanext/privatedatasets/actions.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (c) 2014 - 2017 CoNWeT Lab., Universidad Politécnica de Madrid +# Copyright (c) 2018 Future Internet Consulting and Development Solutions S.L. # This file is part of CKAN Private Dataset Extension. @@ -21,6 +22,7 @@ from __future__ import absolute_import import importlib import logging +import os import ckan.plugins as plugins @@ -151,7 +153,7 @@ def _process_package(context, request_data): plugins.toolkit.check_access(method, context, request_data) # Get the parser from the configuration - class_path = plugins.toolkit.config.get(PARSER_CONFIG_PROP, '') + class_path = os.environ.get(PARSER_CONFIG_PROP.upper().replace('.', '_'), plugins.toolkit.config.get(PARSER_CONFIG_PROP, '')) if class_path != '': try: diff --git a/ckanext/privatedatasets/helpers.py b/ckanext/privatedatasets/helpers.py old mode 100755 new mode 100644 index ad2b455..01f3fc7 --- a/ckanext/privatedatasets/helpers.py +++ b/ckanext/privatedatasets/helpers.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Copyright (c) 2014-2015 CoNWeT Lab., Universidad Politécnica de Madrid +# Copyright (c) 2018 Future Internet Consulting and Development Solutions S.L. # This file is part of CKAN Private Dataset Extension. @@ -20,6 +21,7 @@ from __future__ import absolute_import import logging +import os from ckan.common import request import ckan.model as model @@ -64,9 +66,9 @@ def can_read(pkg_dict): def get_config_bool_value(config_name, default_value=False): - value = tk.config.get(config_name, default_value) - value = value if type(value) == bool else value != 'False' - return value + env_name = config_name.upper().replace('.', '_') + value = os.environ.get(env_name, tk.config.get(config_name, default_value)) + return value if type(value) == bool else value.strip().lower() in ('true', '1', 'on') def show_acquire_url_on_create(): diff --git a/ckanext/privatedatasets/plugin.py b/ckanext/privatedatasets/plugin.py old mode 100755 new mode 100644