diff --git a/pandora/archive/models.py b/pandora/archive/models.py index 6fe4b2c2..0d28aa38 100644 --- a/pandora/archive/models.py +++ b/pandora/archive/models.py @@ -525,10 +525,6 @@ class File(models.Model): status[name] = u'queued' return status - def delete(self, *args, **kwargs): - self.delete_files() - super(File, self).delete(*args, **kwargs) - def delete_frames(self): frames = os.path.join(settings.MEDIA_ROOT, self.get_path('frames')) if os.path.exists(frames): diff --git a/pandora/item/models.py b/pandora/item/models.py index 0fd1eae8..9ae93c78 100644 --- a/pandora/item/models.py +++ b/pandora/item/models.py @@ -436,10 +436,6 @@ class Item(models.Model): if os.path.exists(path): shutil.rmtree(path) - def delete(self, *args, **kwargs): - self.delete_files() - super(Item, self).delete(*args, **kwargs) - def merge_with(self, other, save=True): ''' move all related tables to other and delete self