adebaumann/vgui-cicd
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All development so far tested and merged into production. #9

Manually merged
adebaumann merged 64 commits from development into main 2025-11-06 15:00:58 +00:00
Conversation 0 Commits 64 Files Changed 39 +1 -2
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 28a1bb4b62 - Show all commits

3
dokumente/models.py
View File

@@ -5,7 +5,6 @@ from stichworte.models import Stichwort
from referenzen.models import Referenz from referenzen.models import Referenz
from rollen.models import Rolle from rollen.models import Rolle
import datetime import datetime
from django.db.models import Q
class Dokumententyp(models.Model): class Dokumententyp(models.Model):
name = models.CharField(max_length=100, primary_key=True) name = models.CharField(max_length=100, primary_key=True)
@@ -129,7 +128,7 @@ class Vorgabe(models.Model):
'vorgabe2': vorgabe2, 'vorgabe2': vorgabe2,
'conflict_type': 'date_range_intersection', 'conflict_type': 'date_range_intersection',
'message': f"Vorgaben {vorgabe1.Vorgabennummer()} and {vorgabe2.Vorgabennummer()} " 'message': f"Vorgaben {vorgabe1.Vorgabennummer()} and {vorgabe2.Vorgabennummer()} "
f"have intersecting validity periods" f"überschneiden sich in der Geltungsdauer"
}) })
return conflicts return conflicts