From ce8eaf06ba2b8f7830155d25f5dc59fb6c858e8c Mon Sep 17 00:00:00 2001 From: Bernhard Koschicek-Krombholz Date: Mon, 17 Feb 2025 15:01:34 +0100 Subject: [PATCH 1/8] added nullable to LPF keys --- openatlas/api/openapi.json | 75 ++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/openatlas/api/openapi.json b/openatlas/api/openapi.json index cab45f330..075c9cd9b 100644 --- a/openatlas/api/openapi.json +++ b/openatlas/api/openapi.json @@ -3,7 +3,7 @@ "info": { "title": "OpenAtlas API", "description": "An API that allows user to access data from an OpenAtlas instance.", - "version": "0.4.6", + "version": "0.4.6a", "contact": { "name": "OpenAtlas", "url": "https://openatlas.eu", @@ -2385,6 +2385,7 @@ } }, "when": { + "nullable": true, "type": "object", "properties": { "timespans": { @@ -2397,15 +2398,15 @@ "properties": { "earliest": { "type": "string", - "format": "nullable" + "nullable": true }, "latest": { "type": "string", - "format": "nullable" + "nullable": true }, "comment": { "type": "string", - "format": "nullable" + "nullable": true } } }, @@ -2414,15 +2415,15 @@ "properties": { "earliest": { "type": "string", - "format": "nullable" + "nullable": true }, "latest": { "type": "string", - "format": "nullable" + "nullable": true }, "comment": { "type": "string", - "format": "nullable" + "nullable": true } } } @@ -2432,6 +2433,7 @@ } }, "types": { + "nullable": true, "type": "array", "items": { "type": "object", @@ -2444,7 +2446,7 @@ }, "descriptions": { "type": "string", - "format": "nullable" + "nullable": true }, "hierarchy": { "type": "string" @@ -2472,12 +2474,13 @@ }, "unit": { "type": "string", - "format": "nullable" + "nullable": true } } } }, "relations": { + "nullable": true, "type": "array", "items": { "type": "object", @@ -2496,13 +2499,14 @@ }, "relationDescription": { "type": "string", - "format": "nullable" + "nullable": true }, "type": { "type": "string", - "format": "nullable" + "nullable": true }, "when": { + "nullable": true, "type": "object", "properties": { "timespans": { @@ -2515,15 +2519,15 @@ "properties": { "earliest": { "type": "string", - "format": "nullable" + "nullable": true }, "latest": { "type": "string", - "format": "nullable" + "nullable": true }, "comment": { "type": "string", - "format": "nullable" + "nullable": true } } }, @@ -2532,15 +2536,15 @@ "properties": { "earliest": { "type": "string", - "format": "nullable" + "nullable": true }, "latest": { "type": "string", - "format": "nullable" + "nullable": true }, "comment": { "type": "string", - "format": "nullable" + "nullable": true } } } @@ -2554,15 +2558,15 @@ }, "names": { "type": "string", - "format": "nullable" + "nullable": true }, "links": { "type": "string", - "format": "nullable" + "nullable": true }, "depictions": { "type": "array", - "format": "nullable", + "nullable": true, "items": { "type": "object", "properties": { @@ -2600,6 +2604,7 @@ } }, "geometry": { + "nullable": true, "oneOf": [ { "$ref": "#/components/schemas/Polygon" @@ -2699,22 +2704,22 @@ }, "begin_latest": { "type": "string", - "format": "nullable" + "nullable": true }, "begin_comment": { "type": "string", - "format": "nullable" + "nullable": true }, "end_earliest": { "type": "string" }, "end_latest": { "type": "string", - "format": "nullable" + "nullable": true }, "end_comment": { "type": "string", - "format": "nullable" + "nullable": true }, "types": { "type": "array", @@ -4277,7 +4282,7 @@ }, "aliases": { "type": "string", - "format": "nullable" + "nullable": true }, "description": { "type": "string" @@ -4422,14 +4427,14 @@ }, "pages": { "type": "string", - "format": "nullable" + "nullable": true } } } }, "files": { "type": "string", - "format": "nullable" + "nullable": true }, "types": { "type": "array", @@ -4461,11 +4466,11 @@ }, "value": { "type": "string", - "format": "nullable" + "nullable": true }, "unit": { "type": "string", - "format": "nullable" + "nullable": true }, "externalReferences": { "type": "array", @@ -4944,15 +4949,15 @@ "properties": { "earliest": { "type": "string", - "format": "nullable" + "nullable": true }, "latest": { "type": "string", - "format": "nullable" + "nullable": true }, "comment": { "type": "string", - "format": "nullable" + "nullable": true } } }, @@ -4966,15 +4971,15 @@ "properties": { "earliest": { "type": "string", - "format": "nullable" + "nullable": true }, "latest": { "type": "string", - "format": "nullable" + "nullable": true }, "comment": { "type": "string", - "format": "nullable" + "nullable": true } } } From c71a106731852042402584c0e127e68ac21db849 Mon Sep 17 00:00:00 2001 From: Alexander Watzinger Date: Mon, 17 Feb 2025 15:40:02 +0100 Subject: [PATCH 2/8] Refactor tabs --- openatlas/display/util.py | 2 +- openatlas/templates/layout.html | 2 +- openatlas/views/admin.py | 14 ++++++++------ openatlas/views/annotation.py | 6 +++--- openatlas/views/arche.py | 2 +- openatlas/views/export.py | 2 +- openatlas/views/file.py | 4 ++-- openatlas/views/index.py | 2 +- openatlas/views/note.py | 2 +- openatlas/views/profile.py | 8 ++++---- openatlas/views/token.py | 2 +- openatlas/views/tools.py | 10 +++++----- openatlas/views/type.py | 2 +- openatlas/views/user.py | 2 +- openatlas/views/vocabs.py | 5 +++-- 15 files changed, 34 insertions(+), 31 deletions(-) diff --git a/openatlas/display/util.py b/openatlas/display/util.py index d41ee2f7c..90af0bf5a 100644 --- a/openatlas/display/util.py +++ b/openatlas/display/util.py @@ -203,7 +203,7 @@ def bookmark_toggle(entity_id: int, for_table: bool = False) -> str: @app.template_filter() -def display_menu(entity: Optional[Entity], origin: Optional[Entity]) -> str: +def menu(entity: Optional[Entity], origin: Optional[Entity]) -> str: view_name = '' if entity: view_name = entity.class_.view diff --git a/openatlas/templates/layout.html b/openatlas/templates/layout.html index 5b8851ecd..eb37c219b 100644 --- a/openatlas/templates/layout.html +++ b/openatlas/templates/layout.html @@ -71,7 +71,7 @@