servala/servala-portal
3
0
Fork 0
Code Issues 23 Pull requests 1 Projects 1 Releases Packages 2 Activity Actions

Fix redirect bug
All checks were successful
Tests / test (push) Successful in 25s
Details

Browse source
This commit is contained in:
Tobias Kunze 2025-05-25 23:02:51 +02:00
parent d1d1352cf4
commit d32ed1eb55
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/servala/core/models/service.py
View file

@ -648,7 +648,11 @@ class ServiceInstance(ServalaModelMixin, models.Model):
if self.is_deleted: if self.is_deleted:
return return
if self.spec.get("parameters", {}).get("security", {}).get("deletionProtection"): if (
self.spec.get("parameters", {})
.get("security", {})
.get("deletionProtection")
):
spec = copy.copy(self.spec) spec = copy.copy(self.spec)
spec["parameters"]["security"]["deletionProtection"] = False spec["parameters"]["security"]["deletionProtection"] = False
self.update_spec(spec, user) self.update_spec(spec, user)

3
src/servala/frontend/views/service.py
View file

@ -384,7 +384,6 @@ class ServiceInstanceListView(OrganizationViewMixin, ListView):
"""Return all service instances for the current organization with filtering.""" """Return all service instances for the current organization with filtering."""
queryset = ServiceInstance.objects.filter( queryset = ServiceInstance.objects.filter(
organization=self.request.organization, organization=self.request.organization,
is_deleted=False, # Exclude soft-deleted
).select_related( ).select_related(
"context__service_offering__provider", "context__service_offering__provider",
"context__control_plane", "context__control_plane",
@ -441,4 +440,4 @@ class ServiceInstanceDeleteView(
return response return response
def get_success_url(self): def get_success_url(self):
return self.request.organization.urls.instances return str(self.request.organization.urls.instances)