From 002b037d0f787104d9f5cbee91d358fe98204add Mon Sep 17 00:00:00 2001 From: Birger Schacht Date: Mon, 6 Nov 2023 09:51:21 +0100 Subject: [PATCH] chore(deps): bump apis-core-rdf to 0.6.2, webpag to 1.0.1 adapt settings accordingly --- apis_ontology/settings/server_settings.py | 17 ++++++++++++++--- pyproject.toml | 6 ++++-- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/apis_ontology/settings/server_settings.py b/apis_ontology/settings/server_settings.py index 159c15a..6af80a4 100644 --- a/apis_ontology/settings/server_settings.py +++ b/apis_ontology/settings/server_settings.py @@ -95,13 +95,17 @@ def genderchoices(): from apis_ontology.models import Person return Person.GENDER_CHOICES + (("empty", "Nicht gesetzt"),) +detail_view_exclude = ["references", "notes", "published", "review"] + APIS_ENTITIES = { "Salary": { "relations_per_page": 100, "search": ["name"], "list_filters": { "typ": {"method": filter_empty_string, "extra": {"choices": salarychoices, "required": False }}, - } + }, + "detail_view_exclude": detail_view_exclude, + }, "Function": { "relations_per_page": 100, @@ -113,10 +117,12 @@ def genderchoices(): "name", "alternative_label", ], + "detail_view_exclude": detail_view_exclude, }, "Court": { "relations_per_page": 100, - "search": ["name", "alternative_label"] + "search": ["name", "alternative_label"], + "detail_view_exclude": detail_view_exclude, }, "Place": { "relations_per_page": 100, @@ -127,7 +133,8 @@ def genderchoices(): "additional_cols": ["id", "lat", "lng", "part_of"], "list_filters": { "type": {"method": filter_empty_string, "extra": {"choices": placechoices, "required": False }}, - } + }, + "detail_view_exclude": detail_view_exclude, }, "Person": { "relations_per_page": 100, @@ -154,6 +161,7 @@ def genderchoices(): "name": {"method": name_first_name_alternative_name_filter, "label": "Name or first name or alternative name"}, "gender": {"method": filter_empty_string, "extra": {"choices": genderchoices, "required": False}}, }, + "detail_view_exclude": detail_view_exclude, }, "Institution": { "relations_per_page": 100, @@ -171,6 +179,7 @@ def genderchoices(): "id", "kind", ], + "detail_view_exclude": detail_view_exclude, }, "Work": { "relations_per_page": 100, @@ -180,6 +189,7 @@ def genderchoices(): "id", "kind", ], + "detail_view_exclude": detail_view_exclude, }, "Event": { "relations_per_page": 100, @@ -188,6 +198,7 @@ def genderchoices(): "additional_cols": [ "id", ], + "detail_view_exclude": detail_view_exclude, }, } diff --git a/pyproject.toml b/pyproject.toml index 0f3ee03..d0e9e82 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -11,11 +11,13 @@ packages = [{include = "apis_ontology"}] python = "^3.11" django = ">=4.1,<4.2" mysqlclient = "^2.0.3" -apis-core = { git = "https://github.com/acdh-oeaw/apis-core-rdf.git", tag = "v0.6.1" } -webpage = { git = "https://github.com/acdh-oeaw/apis-webpage.git", tag = "v0.2.0" } +apis-core = { git = "https://github.com/acdh-oeaw/apis-core-rdf.git", tag = "v0.6.2" } +webpage = { git = "https://github.com/acdh-oeaw/apis-webpage.git", tag = "v1.0.1" } apis-bibsonomy = { git = "https://github.com/acdh-oeaw/apis-bibsonomy.git", branch = "birger/fix-referenceonform-issues" } apis-acdhch-default-settings = { git = "https://github.com/acdh-oeaw/apis-acdhch-default-settings.git", tag = "v0.1.9" } django-matomo = "^0.1.6" +# workaround for https://github.com/acdh-oeaw/apis-bibsonomy/issues/38 +jmespath = "^0.10.0" [build-system] requires = ["poetry-core>=1.0.0"]