diff --git a/argocd/deployment.yaml b/argocd/deployment.yaml index 8128995..ab063f5 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.941 + image: git.baumann.gr/adebaumann/vui:0.942 imagePullPolicy: Always ports: - containerPort: 8000 diff --git a/dokumente/models.py b/dokumente/models.py index 1b4b9da..13a95e7 100644 --- a/dokumente/models.py +++ b/dokumente/models.py @@ -60,7 +60,7 @@ 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) + thema = models.ForeignKey(Thema, on_delete=models.PROTECT, blank=False) titel = models.CharField(max_length=255) referenzen = models.ManyToManyField(Referenz, blank=True) gueltigkeit_von = models.DateField() @@ -132,13 +132,13 @@ class Vorgabe(models.Model): }) return conflicts - + def clean(self): """ Validate the Vorgabe before saving. """ from django.core.exceptions import ValidationError - + # Check for conflicts with existing Vorgaben conflicts = self.find_conflicts() if conflicts: @@ -172,9 +172,9 @@ class Vorgabe(models.Model): 'vorgabe1': self, 'vorgabe2': other_vorgabe, 'conflict_type': 'date_range_intersection', - 'message': f"Vorgabe {self.Vorgabennummer()} conflicts with " - f"existing {other_vorgabe.Vorgabennummer()} " - f"due to overlapping validity periods" + 'message': f"Vorgabe {self.Vorgabennummer()} in Konflikt mit " + f"bestehender {other_vorgabe.Vorgabennummer()} " + f" - Geltungsdauer übeschneidet sich" }) return conflicts diff --git a/dokumente/tests.py b/dokumente/tests.py index a6d6f91..317df48 100644 --- a/dokumente/tests.py +++ b/dokumente/tests.py @@ -712,8 +712,8 @@ class VorgabeSanityCheckTest(TestCase): with self.assertRaises(Exception) as context: conflicting_vorgabe.clean() - self.assertIn('conflicts with existing', str(context.exception)) - self.assertIn('overlapping validity periods', str(context.exception)) + self.assertIn('Konflikt mit bestehender', str(context.exception)) + self.assertIn('Geltungsdauer übeschneidet sich', str(context.exception)) def test_check_vorgabe_conflicts_utility(self): """Test check_vorgabe_conflicts utility function""" diff --git a/pages/templates/base.html b/pages/templates/base.html index 1749be3..8dc8607 100644 --- a/pages/templates/base.html +++ b/pages/templates/base.html @@ -31,6 +31,6 @@