diff --git a/.gitignore b/.gitignore index da8a3d8..fbaeba4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ AGENT*.md # Diagram cache directory media/diagram_cache/ .env -data/db.sqlite3 +data/ +dataremote/ diff --git a/VorgabenUI/settings.py b/VorgabenUI/settings.py index 26a43c7..dc48a85 100644 --- a/VorgabenUI/settings.py +++ b/VorgabenUI/settings.py @@ -138,7 +138,7 @@ AUTH_PASSWORD_VALIDATORS = [ LANGUAGE_CODE = 'de-ch' -TIME_ZONE = 'UTC' +TIME_ZONE = 'Europe/Zurich' USE_I18N = True diff --git a/argocd/deployment.yaml b/argocd/deployment.yaml index 38d44f1..aab0629 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.982 + image: git.baumann.gr/adebaumann/vui:0.983 imagePullPolicy: Always securityContext: runAsUser: 99 diff --git a/dokumente/models.py b/dokumente/models.py index 1019a8b..b8c26fb 100644 --- a/dokumente/models.py +++ b/dokumente/models.py @@ -12,7 +12,7 @@ class Dokumententyp(models.Model): verantwortliche_ve = models.CharField(max_length=255) def __str__(self): - return self.name + return str(self.name) class Meta: verbose_name="Dokumententyp" @@ -28,6 +28,7 @@ class Person(models.Model): class Meta: verbose_name_plural="Personen" ordering = ['name'] + verbose_name="Person" class Thema(models.Model): name = models.CharField(max_length=100, primary_key=True) @@ -37,7 +38,7 @@ class Thema(models.Model): return self.name class Meta: verbose_name_plural="Themen" - + verbose_name="Thema" class Dokument(models.Model): nummer = models.CharField(max_length=50, primary_key=True) @@ -49,7 +50,7 @@ class Dokument(models.Model): gueltigkeit_bis = models.DateField(null=True, blank=True) signatur_cso = models.CharField(max_length=255, blank=True) anhaenge = models.TextField(blank=True) - aktiv = models.BooleanField(blank=True) + aktiv = models.BooleanField(blank=True,default=False) def __str__(self): return f"{self.nummer} – {self.name}" diff --git a/pages/templates/base.html b/pages/templates/base.html index e1c0b6b..91df260 100644 --- a/pages/templates/base.html +++ b/pages/templates/base.html @@ -219,7 +219,7 @@

-

Version {{ version|default:"0.980" }}

+

Version {{ version|default:"0.983" }}

diff --git a/referenzen/migrations/0004_alter_referenz_options.py b/referenzen/migrations/0004_alter_referenz_options.py new file mode 100644 index 0000000..a678996 --- /dev/null +++ b/referenzen/migrations/0004_alter_referenz_options.py @@ -0,0 +1,17 @@ +# Generated by Django 6.0.1 on 2026-01-20 08:57 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('referenzen', '0003_alter_referenzerklaerung_options'), + ] + + operations = [ + migrations.AlterModelOptions( + name='referenz', + options={'verbose_name': 'Referenz', 'verbose_name_plural': 'Referenzen'}, + ), + ] diff --git a/referenzen/models.py b/referenzen/models.py index aa99d60..477caff 100644 --- a/referenzen/models.py +++ b/referenzen/models.py @@ -25,6 +25,7 @@ class Referenz(MPTTModel): class Meta: verbose_name_plural="Referenzen" + verbose_name="Referenz" class Referenzerklaerung (Textabschnitt): erklaerung = models.ForeignKey(Referenz,on_delete=models.CASCADE) diff --git a/referenzen/views.py b/referenzen/views.py index 1e1821b..cf2ddfb 100644 --- a/referenzen/views.py +++ b/referenzen/views.py @@ -9,7 +9,7 @@ def tree(request): def detail(request, refid): - referenz_item = Referenz.objects.get(id=refid) + referenz_item = Referenz.objects.get_object_or_404(id=refid) referenz_item.erklaerung = render_textabschnitte(referenz_item.referenzerklaerung_set.order_by("order")) referenz_item.children = list(referenz_item.get_descendants(include_self=True)) for child in referenz_item.children: diff --git a/rollen/migrations/0002_alter_rolle_options.py b/rollen/migrations/0002_alter_rolle_options.py new file mode 100644 index 0000000..194072d --- /dev/null +++ b/rollen/migrations/0002_alter_rolle_options.py @@ -0,0 +1,17 @@ +# Generated by Django 6.0.1 on 2026-01-20 08:57 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('rollen', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='rolle', + options={'verbose_name': 'Rolle (für Relevanz)', 'verbose_name_plural': 'Rolleni (für Relevanz)'}, + ), + ] diff --git a/rollen/models.py b/rollen/models.py index f5093ae..14e00fb 100644 --- a/rollen/models.py +++ b/rollen/models.py @@ -9,9 +9,10 @@ class Rolle(models.Model): return self.name class Meta: verbose_name_plural="Rollen" + verbose_name="Rolle" class RollenBeschreibung(Textabschnitt): abschnitt=models.ForeignKey(Rolle,on_delete=models.CASCADE) class Meta: verbose_name_plural="Rollenbeschreibung" - verbose_name="Rollenbeschreibungs-Abschnitt" \ No newline at end of file + verbose_name="Rollenbeschreibungs-Abschnitt" diff --git a/stichworte/migrations/0004_alter_stichwort_options.py b/stichworte/migrations/0004_alter_stichwort_options.py new file mode 100644 index 0000000..0eadd15 --- /dev/null +++ b/stichworte/migrations/0004_alter_stichwort_options.py @@ -0,0 +1,17 @@ +# Generated by Django 6.0.1 on 2026-01-20 08:57 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('stichworte', '0003_alter_stichworterklaerung_options'), + ] + + operations = [ + migrations.AlterModelOptions( + name='stichwort', + options={'verbose_name': 'Stichwort', 'verbose_name_plural': 'Stichworte'}, + ), + ] diff --git a/stichworte/models.py b/stichworte/models.py index b4a82dc..4281fd8 100644 --- a/stichworte/models.py +++ b/stichworte/models.py @@ -9,6 +9,7 @@ class Stichwort(models.Model): class Meta: verbose_name_plural="Stichworte" + verbose_name = "Stichwort" class Stichworterklaerung (Textabschnitt): erklaerung = models.ForeignKey(Stichwort,on_delete=models.CASCADE)