From bce6df99a0a16c5d0bb6e5cbad75702116d300b1 Mon Sep 17 00:00:00 2001
From: Thorge Petersen <petersen@rz.uni-kiel.de>
Date: Mon, 26 Jun 2023 14:37:51 +0200
Subject: [PATCH] Fixed type of min and max length for tags
---
ckanext/odsh/tests_wip/test_validation.py | 6 +++---
ckanext/odsh/validation.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ckanext/odsh/tests_wip/test_validation.py b/ckanext/odsh/tests_wip/test_validation.py
index 7e6a6300..f21ee446 100644
--- a/ckanext/odsh/tests_wip/test_validation.py
+++ b/ckanext/odsh/tests_wip/test_validation.py
@@ -117,8 +117,8 @@ def test_tag_name_validator_valid():
def test_tag_length_validator_invalid():
- min = toolkit.config.get('ckanext.odsh.min_tag_length',2)
- max = toolkit.config.get('ckanext.odsh.max_tag_length',100)
+ min = int(toolkit.config.get('ckanext.odsh.min_tag_length',2))
+ max = int(toolkit.config.get('ckanext.odsh.max_tag_length',100))
length = round((min + max) / 2)
test_string = _create_test_string(length)
with pytest.raises(Exception):
@@ -126,7 +126,7 @@ def test_tag_length_validator_invalid():
def test_tag_length_validator_valid():
- max = toolkit.config.get('ckanext.odsh.max_tag_length',100)
+ max = int(toolkit.config.get('ckanext.odsh.max_tag_length',100))
length = max + 1
test_string = _create_test_string(length)
tag_length_validator(test_string, None)
diff --git a/ckanext/odsh/validation.py b/ckanext/odsh/validation.py
index a3da4819..f134457b 100644
--- a/ckanext/odsh/validation.py
+++ b/ckanext/odsh/validation.py
@@ -313,8 +313,8 @@ def validate_formats(data, errors):
def tag_length_validator(value, context):
"""Ensures that tag length is in the acceptable range.
"""
- min_tag_length = tk.config.get('ckanext.odsh.min_tag_length',2)
- max_tag_length = tk.config.get('ckanext.odsh.max_tag_length',100)
+ min_tag_length = int(tk.config.get('ckanext.odsh.min_tag_length',2))
+ max_tag_length = int(tk.config.get('ckanext.odsh.max_tag_length',100))
if len(value) < min_tag_length:
raise toolkit.Invalid(
--
GitLab