From d8f774a7c8d8412d96dfa762fa1ea6107cd8a706 Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Sun, 1 Aug 2021 19:45:32 +0200 Subject: [PATCH] Remove storage-specific source code from automatic plan system --- aleksis/apps/chronos/models.py | 21 --------------------- aleksis/apps/chronos/tables.py | 1 - 2 files changed, 22 deletions(-) diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 97f0ee36..c57a874c 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -1229,27 +1229,6 @@ class AutomaticPlan(ExtensibleModel): """Get filename (without path) of the PDF file.""" return f"{self.slug}.pdf" - @property - def path(self) -> str: - """Get the relative path of the PDF file in the media directory.""" - return os.path.join("chronos", "plans", self.filename) - - @property - def local_path(self) -> str: - """Get the full path under which the PDF file can accessed on the local system.""" - try: - return default_storage.path(self.path) - except NotImplementedError: - return self.path - - def save(self, *args, **kwargs): - super().save(*args, **kwargs) - - if self.current_file: - if default_storage.exists(self.path): - default_storage.delete(self.path) - default_storage.save(self.path, self.current_file.file) - class Meta: verbose_name = _("Automatic plan") verbose_name_plural = _("Automatic plans") diff --git a/aleksis/apps/chronos/tables.py b/aleksis/apps/chronos/tables.py index bb699dcb..54acc9a1 100644 --- a/aleksis/apps/chronos/tables.py +++ b/aleksis/apps/chronos/tables.py @@ -52,7 +52,6 @@ class AutomaticPlanTable(tables.Table): name = tables.LinkColumn("edit_automatic_plan", args=[A("id")]) filename = tables.LinkColumn("show_automatic_plan", args=[A("slug")]) - local_path = tables.Column() last_update = tables.DateTimeColumn() last_update_triggered_manually = tables.BooleanColumn() edit = tables.LinkColumn( -- GitLab