From 9090f72bd92203e3388233fb4d21c1af0af39d0a Mon Sep 17 00:00:00 2001 From: Ronald Krist Date: Wed, 22 Nov 2023 14:10:16 +0100 Subject: [PATCH] jinjax ui templates --- setup.cfg | 2 +- tests/test_ui/model.py | 7 ++++--- tests/test_ui/templates/TestDetail.jinja | 5 +++++ tests/test_ui/templates/{test_edit.html => TestEdit.jinja} | 2 +- tests/test_ui/templates/test_detail.html | 5 ----- 5 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 tests/test_ui/templates/TestDetail.jinja rename tests/test_ui/templates/{test_edit.html => TestEdit.jinja} (90%) delete mode 100644 tests/test_ui/templates/test_detail.html diff --git a/setup.cfg b/setup.cfg index 6582738d..f2f66b91 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = oarepo-requests -version = 1.0.1 +version = 1.0.3 description = authors = Ronald Krist readme = README.md diff --git a/tests/test_ui/model.py b/tests/test_ui/model.py index 883d6129..56d5ab5f 100644 --- a/tests/test_ui/model.py +++ b/tests/test_ui/model.py @@ -17,13 +17,14 @@ class ModelUIResourceConfig(RecordsUIResourceConfig): blueprint_name = "thesis" url_prefix = "/thesis/" ui_serializer_class = ThesisUIJSONSerializer + templates = { **RecordsUIResourceConfig.templates, - "detail": {"layout": "test_detail.html", "blocks": {}}, + "detail": {"layout": "TestDetail.jinja", "blocks": {}}, "search": { - "layout": "test_detail.html", + "layout": "TestDetail.jinja", }, - "edit": {"layout": "test_edit.html"}, + "edit": {"layout": "TestEdit.jinja"}, } components = [BabelComponent, PermissionsComponent, AllowedRequestsComponent] diff --git a/tests/test_ui/templates/TestDetail.jinja b/tests/test_ui/templates/TestDetail.jinja new file mode 100644 index 00000000..a355fa0b --- /dev/null +++ b/tests/test_ui/templates/TestDetail.jinja @@ -0,0 +1,5 @@ +{#def extra_context #} +available_requests= +{% for request_name, request in extra_context.allowed_requests.items() %} +{{ request_name }}: {{ request }} +{% endfor %} diff --git a/tests/test_ui/templates/test_edit.html b/tests/test_ui/templates/TestEdit.jinja similarity index 90% rename from tests/test_ui/templates/test_edit.html rename to tests/test_ui/templates/TestEdit.jinja index 62d10503..8bcd6b6b 100644 --- a/tests/test_ui/templates/test_edit.html +++ b/tests/test_ui/templates/TestEdit.jinja @@ -1,4 +1,4 @@ -links={{ links }} +{#def form_config, extra_context #} available_requests= {% for request_name, request in extra_context.allowed_requests.items() %} {{ request_name }}: {{ request }} diff --git a/tests/test_ui/templates/test_detail.html b/tests/test_ui/templates/test_detail.html deleted file mode 100644 index ba6fd402..00000000 --- a/tests/test_ui/templates/test_detail.html +++ /dev/null @@ -1,5 +0,0 @@ -links={{ links }} -available_requests= -{% for request_name, request in allowed_requests.items() %} -{{ request_name }}: {{ request }} -{% endfor %}