diff --git a/ckanext/odsh/helpers.py b/ckanext/odsh/helpers.py index 9927ec0cb5a6cc01e71388c81cc69d89061e32d9..a4881662428c564ec05ba3e75140d89d6bac9bb0 100644 --- a/ckanext/odsh/helpers.py +++ b/ckanext/odsh/helpers.py @@ -229,6 +229,10 @@ def odsh_public_resource_url(res): def odsh_get_version_id(): try: - return subprocess.check_output(["git", "rev-parse", "HEAD"]).strip() + # return subprocess.check_output(["git", "rev-parse", "HEAD"]).strip() + return config.get('ckanext.odsh.version', 'unknown') except: return 'unknown' + +def odsh_show_testbanner(): + return config.get('ckanext.odsh.showtestbanner', 'False') == 'True' diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py index be9f8f7fa5fd21e37d7e0ad2cb4996db465a51a4..b7f70fc9c0b45121286c7bdb71a5df5fbd4152c5 100644 --- a/ckanext/odsh/plugin.py +++ b/ckanext/odsh/plugin.py @@ -291,7 +291,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm 'odsh_has_more_facets': odsh_helpers.odsh_has_more_facets, 'odsh_public_url': odsh_helpers.odsh_public_url, 'odsh_public_resource_url': odsh_helpers.odsh_public_resource_url, - 'odsh_get_version_id': odsh_helpers.odsh_get_version_id + 'odsh_get_version_id': odsh_helpers.odsh_get_version_id, + 'odsh_show_testbanner': odsh_helpers.odsh_show_testbanner } def after_map(self, map): diff --git a/ckanext/odsh/templates/page.html b/ckanext/odsh/templates/page.html index 525e8240c1ac1e427c88b2755a4fba2f736a10ce..3cd01dece9eb8d86bdd41a8a5bb86f31af21909d 100644 --- a/ckanext/odsh/templates/page.html +++ b/ckanext/odsh/templates/page.html @@ -7,9 +7,11 @@ {% set matomo_id = h.odsh_tracking_id()%} <noscript><p><img src="{{matomo_url}}?idsite={{matomo_id}}&rec=1" style="border:0;" alt="" /></p></noscript> <div id="content" class="container"> + {% if h.odsh_show_testbanner() %} <div id="testsystem"> <p>TESTSYSTEM</p> </div> +{% endif %} {% block main_content %} {% block flash %} diff --git a/ckanext/odsh/tests/test_env.py b/ckanext/odsh/tests/test_env.py index 91d2312d7bd5feeaf76be4b70b8540cc1ee72b17..a859f07bb1ad64d7918d6a91fc8c9f36e57f04f9 100644 --- a/ckanext/odsh/tests/test_env.py +++ b/ckanext/odsh/tests/test_env.py @@ -108,7 +108,7 @@ class TestEnv: # who.log_file = %(cache_dir)s/who_log.ini checkConfig('ckan.site_url') - checkConfig('ckan.site_title', 'Open Data Portal Schleswig-Holstein') + checkConfig('ckan.site_title', 'Open Data Schleswig-Holstein') checkConfig('ckan.site_intro_text', '#Willkommen auf Open Data Portal Schleswig-Holstein.') @@ -163,9 +163,10 @@ class TestEnv: checkConfigUrl('ckanext.odsh.matomo_url', responseContains='This resource is part of Matomo') - def test_version(self): - url = checkConfig('ckan.site_url') - if url[-1] == '/': - url = url[:-1] - version = readUrl(url+'/api/resource_qv4yAI2rgotamXGk98gJ').strip() - assert version == expected_commit, "wrong version: {was}!={exp}".format(version, expected_commit) + # def test_version(self): + # # url = checkConfig('ckan.site_url') + # # if url[-1] == '/': + # # url = url[:-1] + # # version = readUrl(url+'/api/resource_qv4yAI2rgotamXGk98gJ').strip() + # version = checkConfig('ckanext.odsh.version') + # assert version == expected_commit, "wrong version: {was}!={exp}".format(version, expected_commit)