From 11a47c973b838e96b97a48f61a70120bace88527 Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Mon, 8 Aug 2022 09:55:17 +0200
Subject: [PATCH] Revert "Merge branch 'master' into 'dev'"
This reverts commit 998bf92d814e6d473002662693905903059380f5, reversing
changes made to 788ddf58af8961652049608785c0474d967f77ca.
---
ckanext/odsh/controller.py | 2 +-
ckanext/odsh/helpers_tpsh.py | 3 +--
ckanext/odsh/templates/user/login.html | 2 --
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/ckanext/odsh/controller.py b/ckanext/odsh/controller.py
index 14bc4ff3..b2962595 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('https://www.schleswig-holstein.de/odpinfo')
+ h.redirect_to('http://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 4beaef20..a6345f37 100644
--- a/ckanext/odsh/helpers_tpsh.py
+++ b/ckanext/odsh/helpers_tpsh.py
@@ -49,8 +49,7 @@ def add_pkg_to_collection(id_pkg, id_collection):
'object': id_collection,
'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():
'''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 6ccaf05a..8efc8821 100644
--- a/ckanext/odsh/templates/user/login.html
+++ b/ckanext/odsh/templates/user/login.html
@@ -1,7 +1,5 @@
{% extends "page.html" %}
-{% set commit_hash = h.tpsh_git_commit_hash() %}
-
{% block subtitle %} {{ _('Login') }} {% endblock %}
{% block skip %}
--
GitLab