Changes in referenz entry field
All checks were successful
Build containers when image tags change / build-if-image-changed (., web, containers, main container, git.baumann.gr/adebaumann/vui) (push) Successful in 31s
Build containers when image tags change / build-if-image-changed (data-loader, loader, initContainers, init-container, git.baumann.gr/adebaumann/vui-data-loader) (push) Successful in 8s

This commit is contained in:
2026-02-12 15:40:21 +01:00
parent bae8c71028
commit f7a20648b2
6 changed files with 26 additions and 11 deletions

View File

@@ -18,7 +18,7 @@ data:
MEDIA_URL: "/media/" MEDIA_URL: "/media/"
# Application Version # Application Version
VERSION: "0.989" VERSION: "0.990"
# Database Configuration (for future use) # Database Configuration (for future use)
# DATABASE_ENGINE: "django.db.backends.sqlite3" # DATABASE_ENGINE: "django.db.backends.sqlite3"

View File

@@ -27,7 +27,7 @@ spec:
mountPath: /data mountPath: /data
containers: containers:
- name: web - name: web
image: git.baumann.gr/adebaumann/vui:0.989 image: git.baumann.gr/adebaumann/vui:0.990
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
runAsUser: 99 runAsUser: 99

View File

@@ -2,11 +2,9 @@ from django.contrib import admin
from django import forms from django import forms
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from mptt.forms import TreeNodeMultipleChoiceField
from nested_admin import NestedStackedInline, NestedModelAdmin, NestedTabularInline from nested_admin import NestedStackedInline, NestedModelAdmin, NestedTabularInline
from .models import * from .models import *
from stichworte.models import Stichwort, Stichworterklaerung from stichworte.models import Stichwort, Stichworterklaerung
from referenzen.models import Referenz
@@ -87,8 +85,6 @@ class EinleitungInline(NestedStackedInline):
) )
class VorgabeForm(forms.ModelForm): class VorgabeForm(forms.ModelForm):
referenzen = TreeNodeMultipleChoiceField(queryset=Referenz.objects.all(), required=False)
class Meta: class Meta:
model = Vorgabe model = Vorgabe
fields = '__all__' fields = '__all__'

View File

@@ -14,7 +14,7 @@ class ReferenzerklaerungInline(NestedStackedInline):
class ReferenzAdmin(NestedModelAdmin): class ReferenzAdmin(NestedModelAdmin):
list_display = ('Path', 'vorgaben_count') list_display = ('Path', 'vorgaben_count')
inlines=[ReferenzerklaerungInline] inlines=[ReferenzerklaerungInline]
search_fields=("name_nummer","Path") search_fields=("name_nummer","name_text")
readonly_fields=("vorgaben_list",) readonly_fields=("vorgaben_list",)
fieldsets = ( fieldsets = (
(None, { (None, {

View File

@@ -13,15 +13,17 @@ class Referenz(MPTTModel):
url = models.URLField(blank=True) url = models.URLField(blank=True)
def Path(self): def Path(self):
Temp = "".join([str(x) for x in self.get_ancestors(include_self=True)])+(" (%s)"%self.name_text if self.name_text else "") path = "".join([x.name_nummer for x in self.get_ancestors(include_self=True)])
return Temp if self.name_text:
path += " (%s)" % self.name_text
return path
class MPTTMeta: class MPTTMeta:
parent_attr = 'oberreferenz' # optional, but safe parent_attr = 'oberreferenz' # optional, but safe
order_insertion_by = ['name_nummer'] order_insertion_by = ['name_nummer']
def __str__(self): def __str__(self):
return self.name_nummer return self.Path()
class Meta: class Meta:
verbose_name_plural="Referenzen" verbose_name_plural="Referenzen"

View File

@@ -0,0 +1,17 @@
# Generated by Django 6.0.1 on 2026-02-12 13:27
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('rollen', '0002_alter_rolle_options'),
]
operations = [
migrations.AlterModelOptions(
name='rolle',
options={'verbose_name': 'Rolle', 'verbose_name_plural': 'Rollen'},
),
]