diff --git a/argocd/deployment.yaml b/argocd/deployment.yaml index f19f8ae..aa8d682 100644 --- a/argocd/deployment.yaml +++ b/argocd/deployment.yaml @@ -25,7 +25,7 @@ spec: mountPath: /data containers: - name: web - image: git.baumann.gr/adebaumann/vui:0.937 + image: git.baumann.gr/adebaumann/vui:0.938 imagePullPolicy: Always ports: - containerPort: 8000 diff --git a/data/db.sqlite3 b/data/db.sqlite3 index be40bde..38eee0f 100644 Binary files a/data/db.sqlite3 and b/data/db.sqlite3 differ diff --git a/dokumente/admin.py b/dokumente/admin.py index 9769e4f..20621e9 100644 --- a/dokumente/admin.py +++ b/dokumente/admin.py @@ -4,6 +4,7 @@ from nested_admin import NestedStackedInline, NestedModelAdmin, NestedTabularInl from django import forms from mptt.forms import TreeNodeMultipleChoiceField from mptt.admin import DraggableMPTTAdmin +from adminsortable2.admin import SortableInlineAdminMixin, SortableAdminBase # Register your models here. from .models import * @@ -66,10 +67,11 @@ class VorgabeForm(forms.ModelForm): model = Vorgabe fields = '__all__' -class VorgabeInline(NestedTabularInline): # or StackedInline for more vertical layout +class VorgabeInline(SortableInlineAdminMixin, NestedTabularInline): # or StackedInline for more vertical layout model = Vorgabe form = VorgabeForm extra = 0 + sortable_field_name = "order" # Add this - make sure your Vorgabe model has an 'order' field #show_change_link = True inlines = [VorgabeKurztextInline,VorgabeLangtextInline,ChecklistenfragenInline] autocomplete_fields = ['stichworte','referenzen','relevanz'] @@ -100,7 +102,7 @@ class PersonAdmin(admin.ModelAdmin): @admin.register(Dokument) -class DokumentAdmin(NestedModelAdmin): +class DokumentAdmin(SortableAdminBase, NestedModelAdmin): actions_on_top=True inlines = [EinleitungInline,GeltungsbereichInline,VorgabeInline] #filter_horizontal=['autoren','pruefende'] diff --git a/dokumente/migrations/0009_alter_vorgabe_options_vorgabe_order.py b/dokumente/migrations/0009_alter_vorgabe_options_vorgabe_order.py new file mode 100644 index 0000000..61b75ae --- /dev/null +++ b/dokumente/migrations/0009_alter_vorgabe_options_vorgabe_order.py @@ -0,0 +1,23 @@ +# Generated by Django 5.2.5 on 2025-10-28 14:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('dokumente', '0008_dokument_aktiv'), + ] + + operations = [ + migrations.AlterModelOptions( + name='vorgabe', + options={'ordering': ['order'], 'verbose_name_plural': 'Vorgaben'}, + ), + migrations.AddField( + model_name='vorgabe', + name='order', + field=models.IntegerField(default=0), + preserve_default=False, + ), + ] diff --git a/dokumente/models.py b/dokumente/models.py index 4b856ef..2d6d297 100644 --- a/dokumente/models.py +++ b/dokumente/models.py @@ -57,6 +57,7 @@ class Dokument(models.Model): verbose_name="Dokument" class Vorgabe(models.Model): + order = models.IntegerField() nummer = models.IntegerField() dokument = models.ForeignKey(Dokument, on_delete=models.CASCADE, related_name='vorgaben') thema = models.ForeignKey(Thema, on_delete=models.PROTECT) @@ -87,7 +88,7 @@ class Vorgabe(models.Model): class Meta: verbose_name_plural="Vorgaben" - + ordering = ['order'] class VorgabeLangtext(Textabschnitt): abschnitt=models.ForeignKey(Vorgabe,on_delete=models.CASCADE) diff --git a/requirements.txt b/requirements.txt index 6500001..ff88714 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ charset-normalizer==3.4.3 curtsies==0.4.3 cwcwidth==0.1.10 Django==5.2.5 +django-admin-sortable2==2.2.8 django-js-asset==3.1.2 django-mptt==0.17.0 django-mptt-admin==2.8.0