From a5d46b696f5b8a9aacecd277b1e9c397e28b9cb8 Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Wed, 5 Nov 2025 10:37:11 +0100 Subject: [PATCH] Code style --- src/servala/core/crd.py | 2 +- src/servala/frontend/forms/organization.py | 1 - src/servala/frontend/views/service.py | 30 +++++++++++++++------- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/src/servala/core/crd.py b/src/servala/core/crd.py index e414168..8c31a27 100644 --- a/src/servala/core/crd.py +++ b/src/servala/core/crd.py @@ -6,7 +6,7 @@ from django.db import models from django.forms.models import ModelForm, ModelFormMetaclass from django.utils.translation import gettext_lazy as _ -from servala.core.models import ServiceInstance, ControlPlaneCRD +from servala.core.models import ControlPlaneCRD, ServiceInstance from servala.frontend.forms.widgets import DynamicArrayField, DynamicArrayWidget diff --git a/src/servala/frontend/forms/organization.py b/src/servala/frontend/forms/organization.py index 86ba0ab..45e7b11 100644 --- a/src/servala/frontend/forms/organization.py +++ b/src/servala/frontend/forms/organization.py @@ -8,7 +8,6 @@ from servala.core.models import Organization, OrganizationInvitation, Organizati from servala.core.odoo import get_invoice_addresses, get_odoo_countries from servala.frontend.forms.mixins import HtmxMixin - ORG_NAME_PATTERN = r"[\w\s\-.,&'()+]+" diff --git a/src/servala/frontend/views/service.py b/src/servala/frontend/views/service.py index 2c6923e..0f9800e 100644 --- a/src/servala/frontend/views/service.py +++ b/src/servala/frontend/views/service.py @@ -123,7 +123,9 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView def context_object(self): if self.request.method == "POST": return ControlPlaneCRD.objects.filter( - pk=self.request.POST.get("expert-context", self.request.POST.get("custom-context")), + pk=self.request.POST.get( + "expert-context", self.request.POST.get("custom-context") + ), # Make sure we don’t use a malicious ID control_plane__in=self.planes, ).first() @@ -131,19 +133,27 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView control_plane=self.selected_plane, service_offering=self.object ).first() - def get_instance_form_kwargs(self, ignore_data=False): - return {"initial": { - "organization": self.request.organization, - "context": self.context_object, - }, "prefix": "expert", "data": self.request.POST if (self.request.method == "POST" and not ignore_data) else None - } + return { + "initial": { + "organization": self.request.organization, + "context": self.context_object, + }, + "prefix": "expert", + "data": ( + self.request.POST + if (self.request.method == "POST" and not ignore_data) + else None + ), + } def get_instance_form(self, ignore_data=False): if not self.context_object or not self.context_object.model_form_class: return - return self.context_object.model_form_class(**self.get_instance_form_kwargs(ignore_data=ignore_data)) + return self.context_object.model_form_class( + **self.get_instance_form_kwargs(ignore_data=ignore_data) + ) def get_custom_instance_form(self, ignore_data=False): if not self.context_object or not self.context_object.custom_model_form_class: @@ -169,7 +179,9 @@ class ServiceOfferingDetailView(OrganizationViewMixin, HtmxViewMixin, DetailView context["custom_service_form"] = self.get_custom_instance_form() else: context["service_form"] = self.get_instance_form() - context["custom_service_form"] = self.get_custom_instance_form(ignore_data=True) + context["custom_service_form"] = self.get_custom_instance_form( + ignore_data=True + ) else: context["service_form"] = self.get_instance_form() context["custom_service_form"] = self.get_custom_instance_form()