From a02e62d89ca1d5c00dcec8a403e92dd99297a0b6 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 12 Mar 2021 09:40:27 +0100 Subject: [PATCH] Bugs und so --- adm/urls.py | 1 - adm/views.py | 12 ++++++++ cloud/models.py | 6 +--- .../dasettings/absencereason_update.html | 16 +++++++++- .../__pycache__/settings.cpython-38.pyc | Bin 4787 -> 4787 bytes dump.rdb | Bin 542937 -> 8558 bytes organizer/models.py | 2 +- .../timemanagement_management.html | 12 ++++++-- .../timemanagement/tm_ab_management.html | 2 +- timemanagement/views.py | 28 +++++++++++------- users/views.py | 2 ++ 11 files changed, 59 insertions(+), 22 deletions(-) diff --git a/adm/urls.py b/adm/urls.py index fe07012..2f0acda 100644 --- a/adm/urls.py +++ b/adm/urls.py @@ -23,5 +23,4 @@ urlpatterns = [ path('wd//delete', AdmWorkdayDelete.as_view(), name="adm-workday-delete"), path('wd/break//delete', AdmBreakDelete.as_view(), name="adm-break-delete"), path('wd//break/add', AdmAddBreak.as_view(), name="adm-break-add"), - ] diff --git a/adm/views.py b/adm/views.py index e3ee5a5..fbabe04 100644 --- a/adm/views.py +++ b/adm/views.py @@ -655,3 +655,15 @@ class AdmAddBreak(CreateView): + + + + + + + + + + + + diff --git a/cloud/models.py b/cloud/models.py index 3ef779b..bd03a89 100644 --- a/cloud/models.py +++ b/cloud/models.py @@ -10,7 +10,6 @@ def user_directory_path(instance, filename): # file will be uploaded to MEDIA_ROOT/agency_/files// return 'agencydata/agency_{0}/files/{1}'.format(instance.agency.pk, filename) - class Data(models.Model): subdir = models.CharField(max_length=2000, default="", blank=True, null=True) def1 = models.CharField(max_length=2000, default="", blank=True, null=True) @@ -23,8 +22,6 @@ class Data(models.Model): def __str__(self): return str(self.file.name) - - class DataDir(models.Model): name = models.CharField(max_length=2000, default="", blank=True, null=True) def2 = models.CharField(max_length=2000, default="", blank=True, null=True) @@ -41,7 +38,6 @@ class DataDir(models.Model): def __str__(self): return str(self.name) - class DataFile(models.Model): name = models.CharField(max_length=2000, default="", blank=True, null=True) def2 = models.CharField(max_length=2000, default="", blank=True, null=True) @@ -50,7 +46,7 @@ class DataFile(models.Model): date_last_modified = models.DateTimeField(default = timezone.now) owner = models.ForeignKey(User, on_delete=models.SET_NULL, default=None, blank=True, null=True) agency = models.ForeignKey(Agency, on_delete=models.CASCADE, default=None, blank=True, null=True) - parent = models.ForeignKey(DataDir, on_delete=models.PROTECT, related_name='thisfileindir', blank=True, null=True) + parent = models.ForeignKey(DataDir, on_delete=models.CASCADE, related_name='thisfileindir', blank=True, null=True) def __str__(self): return str(self.name) diff --git a/dasettings/templates/dasettings/absencereason_update.html b/dasettings/templates/dasettings/absencereason_update.html index b43a07d..d29a3a4 100644 --- a/dasettings/templates/dasettings/absencereason_update.html +++ b/dasettings/templates/dasettings/absencereason_update.html @@ -26,7 +26,7 @@ noclickeffect:active { border-style: outset !important;}
{% csrf_token %} - {{ form|crispy }} + {{form|crispy}}
@@ -37,7 +37,21 @@ noclickeffect:active { border-style: outset !important;}