From c056f648a75364ebbae61c4eacccd5d8281c0641 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Wed, 11 Nov 2020 19:31:37 +0100 Subject: [PATCH] =?UTF-8?q?Agenturl=C3=B6schen=20START?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- areas/models.py | 2 +- organizer/models.py | 6 +++--- users/models.py | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/areas/models.py b/areas/models.py index 49f98dd..6be2c42 100644 --- a/areas/models.py +++ b/areas/models.py @@ -19,7 +19,7 @@ users speichert alle primary-Keys der User, welche diesem Bereich zugeordnet sin class Areas(models.Model): # Wenn die Area gelöscht wird, wird NICHT die Agency gelöscht - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) name = models.CharField(max_length=200, blank=False) color = RGBColorField(colors=['#FFB900', '#E74856', '#0078D7', '#0099BC', '#7A7574'], default='#0099BC', blank=True) desc = models.TextField(max_length=3000, blank=True) diff --git a/organizer/models.py b/organizer/models.py index a10a55b..8a931e2 100644 --- a/organizer/models.py +++ b/organizer/models.py @@ -18,7 +18,7 @@ users speichert alle primary-Keys der User, welche diesem Bereich zugeordnet sin ''' class QuickLinks(models.Model): - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) name = models.CharField(max_length=200, blank=False) link = models.CharField(max_length=200, blank=False) logo = models.ImageField(default='agencymain/linkdefault.png', upload_to='agencymain', blank=True) @@ -37,14 +37,14 @@ class QuickLinks(models.Model): return "/media/agencymain/linkdefault.png" class AGContactsCagetory(models.Model): - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) name = models.CharField(default="", max_length=200, blank=False) def __str__(self): return f'{self.name}' class AGContacts(models.Model): - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) personname = models.CharField(default="", max_length=200, blank=False) name = models.CharField(default="", max_length=200, blank=False) mail = models.CharField(default="", max_length=200, blank=False) diff --git a/users/models.py b/users/models.py index 399694e..4f31f0e 100644 --- a/users/models.py +++ b/users/models.py @@ -155,7 +155,7 @@ class Agency(models.Model): # Speichern der Rechnungs-ID von LexOffice class AgencyBills(models.Model): lexid = models.CharField(max_length=200, default="", null=True, blank=True) - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) billtype = models.CharField(default="", max_length=200) billdate = models.DateField(default=timezone.now) billnumber = models.CharField(default="", max_length=200) @@ -176,7 +176,7 @@ Class AgencyJob ''' class AgencyJob(models.Model): name = models.CharField(default="", max_length=80) - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) def __str__(self): return f'{self.name}' @@ -211,7 +211,7 @@ class Profile(models.Model): # Wenn die Funktion gelöscht wird, wird die FUNC auf NULL gesetzt func = models.ForeignKey("AgencyJob", blank=True, null=True, default=None, on_delete=models.SET_NULL) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) image = models.ImageField(default='default.jpg', upload_to=picturepath_user, blank=True) compfunc = models.CharField(max_length=60, blank=True) visible = models.BooleanField(default=True) @@ -454,7 +454,7 @@ class UserNotifications(models.Model): class UserYearAbsenceInfo(models.Model): - agency = models.ForeignKey(Agency, on_delete=models.PROTECT, default=None) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE, default=None) user = models.ForeignKey(User, on_delete=models.CASCADE) year = models.IntegerField() days_inuse = models.FloatField(default=0.0) @@ -470,7 +470,7 @@ class UserYearAbsenceInfo(models.Model): ''' class AgencyGroup(models.Model): group = models.OneToOneField(Group, on_delete=models.CASCADE) - agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + agency = models.ForeignKey(Agency, on_delete=models.CASCADE) agencygroupname = models.CharField(max_length=60, blank=True) savefordel = models.BooleanField(default=False) is_admin = models.BooleanField(default=False)