diff --git a/ckanext/odsh/controller.py b/ckanext/odsh/controller.py index b296259547a5a6d4ca3a34c21bb532dd93fb2683..14bc4ff3cd089bab7811367094626796bf4f42d9 100644 --- a/ckanext/odsh/controller.py +++ b/ckanext/odsh/controller.py @@ -31,7 +31,7 @@ get_action = logic.get_action class OdshRouteController(HomeController): def info_page(self): - h.redirect_to('http://www.schleswig-holstein.de/odpinfo') + h.redirect_to('https://www.schleswig-holstein.de/odpinfo') def start(self): h.redirect_to('/dataset') diff --git a/ckanext/odsh/helpers_tpsh.py b/ckanext/odsh/helpers_tpsh.py index a6345f3771cfcc7a7e1834b8968898fcbd9a7a3f..4beaef201da1f5d17315140b07e7c2cb6bbbb27c 100644 --- a/ckanext/odsh/helpers_tpsh.py +++ b/ckanext/odsh/helpers_tpsh.py @@ -49,7 +49,8 @@ def add_pkg_to_collection(id_pkg, id_collection): 'object': id_collection, 'type': 'child_of', } - toolkit.get_action('package_relationship_create')(None, relationship_dict) + if toolkit.check_access('package_relationship_create',relationship_dict): + toolkit.get_action('package_relationship_create')(None, relationship_dict) def use_matomo(): '''Return the value of the use_matomo config setting. diff --git a/ckanext/odsh/templates/user/login.html b/ckanext/odsh/templates/user/login.html index 8efc8821a083a2720d55c02dc6f27429f939463b..6ccaf05a9dbdcb93a9580749252ee4a901f120ff 100644 --- a/ckanext/odsh/templates/user/login.html +++ b/ckanext/odsh/templates/user/login.html @@ -1,5 +1,7 @@ {% extends "page.html" %} +{% set commit_hash = h.tpsh_git_commit_hash() %} + {% block subtitle %} {{ _('Login') }} {% endblock %} {% block skip %}