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

Merge pull request 'Fix instance creation' (#65) from 63-instance-creation-bug into main
All checks were successful
Build and Deploy Staging / build (push) Successful in 57s
Details
Tests / test (push) Successful in 23s
Details
Build and Deploy Staging / deploy (push) Successful in 9s
Details

Browse source 
Reviewed-on: #65
This commit is contained in:
Tobias Kunze 2025-05-26 09:46:21 +00:00
commit d8cc90188e
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/servala/core/crd.py
View file

@ -191,12 +191,17 @@ class CrdModelFormMixin:
field_name field_name
for field_name, field in self.fields.items() for field_name, field in self.fields.items()
if not field_name.startswith("spec.") if not field_name.startswith("spec.")
and not isinstance(field.widget, forms.HiddenInput)
] ]
if general_fields: if general_fields:
fieldsets.append( fieldset = {"title": "General", "fields": general_fields, "fieldsets": []}
{"title": "General", "fields": general_fields, "fieldsets": []} if all(
) [
isinstance(self.fields[field].widget, forms.HiddenInput)
for field in general_fields
]
):
fieldset["hidden"] = True
fieldsets.append(fieldset)
# Process spec fields # Process spec fields
others = [] others = []

28
src/servala/frontend/templates/includes/tabbed_fieldset_form.html
View file

@ -6,23 +6,25 @@
{% csrf_token %} {% csrf_token %}
<ul class="nav nav-tabs" id="myTab" role="tablist"> <ul class="nav nav-tabs" id="myTab" role="tablist">
{% for fieldset in form.get_fieldsets %} {% for fieldset in form.get_fieldsets %}
<li class="nav-item" role="presentation"> {% if not fieldset.hidden %}
<button class="nav-link {% if forloop.first %}active{% endif %}" <li class="nav-item" role="presentation">
id="{{ fieldset.title|slugify }}-tab" <button class="nav-link {% if forloop.first %}active{% endif %}"
data-bs-toggle="tab" id="{{ fieldset.title|slugify }}-tab"
data-bs-target="#{{ fieldset.title|slugify }}" data-bs-toggle="tab"
type="button" data-bs-target="#{{ fieldset.title|slugify }}"
role="tab" type="button"
aria-controls="{{ fieldset.title|slugify }}" role="tab"
aria-selected="{% if forloop.first %}true{% else %}false{% endif %}"> aria-controls="{{ fieldset.title|slugify }}"
{{ fieldset.title }} aria-selected="{% if forloop.first %}true{% else %}false{% endif %}">
</button> {{ fieldset.title }}
</li> </button>
</li>
{% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
<div class="tab-content" id="myTabContent"> <div class="tab-content" id="myTabContent">
{% for fieldset in form.get_fieldsets %} {% for fieldset in form.get_fieldsets %}
<div class="tab-pane fade my-2 {% if forloop.first %}show active{% endif %}" <div class="tab-pane fade my-2 {% if fieldset.hidden %}d-none{% endif %}{% if forloop.first %}show active{% endif %}"
id="{{ fieldset.title|slugify }}" id="{{ fieldset.title|slugify }}"
role="tabpanel" role="tabpanel"
aria-labelledby="{{ fieldset.title|slugify }}-tab"> aria-labelledby="{{ fieldset.title|slugify }}-tab">