Skip to content
Snippets Groups Projects
Commit 52bfe3f0 authored by anonymous's avatar anonymous
Browse files

add flag for test banner

parent 9adb266e
Branches
Tags
No related merge requests found
...@@ -229,6 +229,10 @@ def odsh_public_resource_url(res): ...@@ -229,6 +229,10 @@ def odsh_public_resource_url(res):
def odsh_get_version_id(): def odsh_get_version_id():
try: 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: except:
return 'unknown' return 'unknown'
def odsh_show_testbanner():
return config.get('ckanext.odsh.showtestbanner', 'False') == 'True'
...@@ -291,7 +291,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm ...@@ -291,7 +291,8 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
'odsh_has_more_facets': odsh_helpers.odsh_has_more_facets, 'odsh_has_more_facets': odsh_helpers.odsh_has_more_facets,
'odsh_public_url': odsh_helpers.odsh_public_url, 'odsh_public_url': odsh_helpers.odsh_public_url,
'odsh_public_resource_url': odsh_helpers.odsh_public_resource_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): def after_map(self, map):
......
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
{% set matomo_id = h.odsh_tracking_id()%} {% set matomo_id = h.odsh_tracking_id()%}
<noscript><p><img src="{{matomo_url}}?idsite={{matomo_id}}&rec=1" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="{{matomo_url}}?idsite={{matomo_id}}&rec=1" style="border:0;" alt="" /></p></noscript>
<div id="content" class="container"> <div id="content" class="container">
{% if h.odsh_show_testbanner() %}
<div id="testsystem"> <div id="testsystem">
<p>TESTSYSTEM</p> <p>TESTSYSTEM</p>
</div> </div>
{% endif %}
{% block main_content %} {% block main_content %}
{% block flash %} {% block flash %}
......
...@@ -108,7 +108,7 @@ class TestEnv: ...@@ -108,7 +108,7 @@ class TestEnv:
# who.log_file = %(cache_dir)s/who_log.ini # who.log_file = %(cache_dir)s/who_log.ini
checkConfig('ckan.site_url') 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', checkConfig('ckan.site_intro_text',
'#Willkommen auf Open Data Portal Schleswig-Holstein.') '#Willkommen auf Open Data Portal Schleswig-Holstein.')
...@@ -163,9 +163,10 @@ class TestEnv: ...@@ -163,9 +163,10 @@ class TestEnv:
checkConfigUrl('ckanext.odsh.matomo_url', checkConfigUrl('ckanext.odsh.matomo_url',
responseContains='This resource is part of Matomo') responseContains='This resource is part of Matomo')
def test_version(self): # def test_version(self):
url = checkConfig('ckan.site_url') # # url = checkConfig('ckan.site_url')
if url[-1] == '/': # # if url[-1] == '/':
url = url[:-1] # # url = url[:-1]
version = readUrl(url+'/api/resource_qv4yAI2rgotamXGk98gJ').strip() # # version = readUrl(url+'/api/resource_qv4yAI2rgotamXGk98gJ').strip()
assert version == expected_commit, "wrong version: {was}!={exp}".format(version, expected_commit) # version = checkConfig('ckanext.odsh.version')
# assert version == expected_commit, "wrong version: {was}!={exp}".format(version, expected_commit)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment