Skip to content
Snippets Groups Projects
Commit 998bf92d authored by Jesper Zedlitz's avatar Jesper Zedlitz
Browse files

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
parents 788ddf58 0946cd91
Branches
Tags
1 merge request!17Stage System soll in Zukunft Master Branch erhalten
...@@ -31,7 +31,7 @@ get_action = logic.get_action ...@@ -31,7 +31,7 @@ get_action = logic.get_action
class OdshRouteController(HomeController): class OdshRouteController(HomeController):
def info_page(self): 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): def start(self):
h.redirect_to('/dataset') h.redirect_to('/dataset')
......
...@@ -49,6 +49,7 @@ def add_pkg_to_collection(id_pkg, id_collection): ...@@ -49,6 +49,7 @@ def add_pkg_to_collection(id_pkg, id_collection):
'object': id_collection, 'object': id_collection,
'type': 'child_of', 'type': 'child_of',
} }
if toolkit.check_access('package_relationship_create',relationship_dict):
toolkit.get_action('package_relationship_create')(None, relationship_dict) toolkit.get_action('package_relationship_create')(None, relationship_dict)
def use_matomo(): def use_matomo():
......
{% extends "page.html" %} {% extends "page.html" %}
{% set commit_hash = h.tpsh_git_commit_hash() %}
{% block subtitle %} {{ _('Login') }} {% endblock %} {% block subtitle %} {{ _('Login') }} {% endblock %}
{% block skip %} {% block skip %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment