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

Compare commits

base: servala:d8cc90188e4a6662e5a0bbe3493c57397f4e0da6
Branches Tags
servala:main
servala:54-billing-entity-management
servala:renovate/lock-file-maintenance
servala:2025.04.14-1
..
compare: servala:07393cfd61200f23d4dc4e69870e76c7064a803a
Branches Tags
servala:54-billing-entity-management
servala:main
servala:renovate/lock-file-maintenance
servala:2025.04.14-1

No commits in common. "d8cc90188e4a6662e5a0bbe3493c57397f4e0da6" and "07393cfd61200f23d4dc4e69870e76c7064a803a" have entirely different histories.
d8cc90188e ... 07393cfd61

2 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -191,17 +191,12 @@ 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:
fieldset = {"title": "General", "fields": general_fields, "fieldsets": []} fieldsets.append(
if all( {"title": "General", "fields": general_fields, "fieldsets": []}
[ )
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,25 +6,23 @@
{% 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 %}
{% if not fieldset.hidden %} <li class="nav-item" role="presentation">
<li class="nav-item" role="presentation"> <button class="nav-link {% if forloop.first %}active{% endif %}"
<button class="nav-link {% if forloop.first %}active{% endif %}" id="{{ fieldset.title|slugify }}-tab"
id="{{ fieldset.title|slugify }}-tab" data-bs-toggle="tab"
data-bs-toggle="tab" data-bs-target="#{{ fieldset.title|slugify }}"
data-bs-target="#{{ fieldset.title|slugify }}" type="button"
type="button" role="tab"
role="tab" aria-controls="{{ fieldset.title|slugify }}"
aria-controls="{{ fieldset.title|slugify }}" aria-selected="{% if forloop.first %}true{% else %}false{% endif %}">
aria-selected="{% if forloop.first %}true{% else %}false{% endif %}"> {{ fieldset.title }}
{{ fieldset.title }} </button>
</button> </li>
</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 fieldset.hidden %}d-none{% endif %}{% if forloop.first %}show active{% endif %}" <div class="tab-pane fade my-2 {% 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">