Merge branch 'master' into 'dev'

# Conflicts:
#   ckanext/odsh/collection/controller.py
#   ckanext/odsh/collection/helpers.py
#   ckanext/odsh/controller.py
#   ckanext/odsh/helpers_tpsh.py
#   ckanext/odsh/plugin.py
#   ckanext/odsh/profiles/odsh_dcat_de_profile.py
#   ckanext/odsh/public/odsh.css
#   ckanext/odsh/templates/user/login.html
#   ckanext/odsh/validation.py

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')

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.

ckanext/odsh/templates/user/login.html

 {% extends "page.html" %}
 
+{% set commit_hash = h.tpsh_git_commit_hash() %}
+
 {% block subtitle %} {{ _('Login') }} {% endblock %}
 
 {% block skip %}