From 52bfe3f0e4c371e2bc0f0f160a90cc6ba6388e22 Mon Sep 17 00:00:00 2001
From: anonymous <anonymous>
Date: Thu, 6 Jun 2019 13:04:23 +0200
Subject: [PATCH] add flag for test banner
---
ckanext/odsh/helpers.py | 6 +++++-
ckanext/odsh/plugin.py | 3 ++-
ckanext/odsh/templates/page.html | 2 ++
ckanext/odsh/tests/test_env.py | 15 ++++++++-------
4 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/ckanext/odsh/helpers.py b/ckanext/odsh/helpers.py
index 9927ec0c..a4881662 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 be9f8f7f..b7f70fc9 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 525e8240..3cd01dec 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 91d2312d..a859f07b 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)
--
GitLab