From 4bb52cda4fc99a49125a4a609dbce8362ded8037 Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Wed, 21 May 2025 09:29:28 +0200 Subject: [PATCH] Add links between detail and update page --- src/servala/frontend/templates/frontend/base.html | 10 +++++++--- .../organizations/service_instance_detail.html | 5 +++++ .../organizations/service_instance_update.html | 3 +++ src/servala/frontend/views/service.py | 4 ++++ src/servala/static/css/servala.css | 5 +++++ 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/servala/frontend/templates/frontend/base.html b/src/servala/frontend/templates/frontend/base.html index f5ce6dd..89d363f 100644 --- a/src/servala/frontend/templates/frontend/base.html +++ b/src/servala/frontend/templates/frontend/base.html @@ -25,9 +25,13 @@

- {% block page_title %} - Dashboard - {% endblock page_title %} + + {% block page_title %} + Dashboard + {% endblock page_title %} + + {% block page_title_extra %} + {% endblock page_title_extra %}

diff --git a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html index b9cf4dc..973d2f1 100644 --- a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html +++ b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html @@ -5,6 +5,11 @@ {{ instance.name }} {% endblock page_title %} {% endblock html_title %} +{% block page_title_extra %} + {% if has_change_permission %} + {% translate "Edit" %} + {% endif %} +{% endblock page_title_extra %} {% block content %}
diff --git a/src/servala/frontend/templates/frontend/organizations/service_instance_update.html b/src/servala/frontend/templates/frontend/organizations/service_instance_update.html index cbfbd6f..fa7f502 100644 --- a/src/servala/frontend/templates/frontend/organizations/service_instance_update.html +++ b/src/servala/frontend/templates/frontend/organizations/service_instance_update.html @@ -9,6 +9,9 @@ {% endblock %} {% endblock page_title %} {% endblock html_title %} +{% block page_title_extra %} + {% translate "Back" %} +{% endblock page_title_extra %} {% partialdef service-form %} {% if form %}
diff --git a/src/servala/frontend/views/service.py b/src/servala/frontend/views/service.py index 0a0fe10..298d5bc 100644 --- a/src/servala/frontend/views/service.py +++ b/src/servala/frontend/views/service.py @@ -209,6 +209,10 @@ class ServiceInstanceDetailView( context = super().get_context_data(**kwargs) if self.object.kubernetes_object and self.object.spec: context["spec_fieldsets"] = self.get_nested_spec() + permission_required = ServiceInstance.get_perm("change") + context["has_change_permission"] = self.request.user.has_perm( + permission_required, self.object + ) return context def get_nested_spec(self): diff --git a/src/servala/static/css/servala.css b/src/servala/static/css/servala.css index e2eb044..e607205 100644 --- a/src/servala/static/css/servala.css +++ b/src/servala/static/css/servala.css @@ -85,3 +85,8 @@ html[data-bs-theme="dark"] .btn-outline-primary, .btn-outline-primary { a.btn-keycloak { display: inline-flex; } +.page-heading h3 { + display: flex; + flex-wrap: wrap; + justify-content: space-between; +}