diff --git a/mayan/apps/common/models.py b/mayan/apps/common/models.py index 2524077280..fb6276ea92 100644 --- a/mayan/apps/common/models.py +++ b/mayan/apps/common/models.py @@ -34,11 +34,11 @@ class SharedUploadedFile(models.Model): super(SharedUploadedFile, self).save(*args, **kwargs) def delete(self, *args, **kwargs): - self.file.storage.delete(self.file.path) + self.file.storage.delete(self.file.name) return super(SharedUploadedFile, self).delete(*args, **kwargs) def open(self): - return self.file.storage.open(self.file.path) + return self.file.storage.open(self.file.name) @python_2_unicode_compatible diff --git a/mayan/apps/document_signatures/managers.py b/mayan/apps/document_signatures/managers.py index c9056f9ba7..68159046f2 100644 --- a/mayan/apps/document_signatures/managers.py +++ b/mayan/apps/document_signatures/managers.py @@ -59,7 +59,7 @@ class DocumentVersionSignatureManager(models.Manager): def detached_signature(self, document_version): document_signature = self.get_document_signature(document_version=document_version) - return document_signature.signature_file.storage.open(document_signature.signature_file.path) + return document_signature.signature_file.storage.open(document_signature.signature_file.name) def verify_signature(self, document_version): document_version_descriptor = document_version.open(raw=True) diff --git a/mayan/apps/document_signatures/models.py b/mayan/apps/document_signatures/models.py index cdb46bfb19..a66fd55952 100644 --- a/mayan/apps/document_signatures/models.py +++ b/mayan/apps/document_signatures/models.py @@ -37,7 +37,7 @@ class DocumentVersionSignature(models.Model): self.save() def delete_detached_signature_file(self): - self.signature_file.storage.delete(self.signature_file.path) + self.signature_file.storage.delete(self.signature_file.name) class Meta: verbose_name = _('Document version signature') diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 36391a4955..8f54458ba6 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -411,7 +411,7 @@ class DocumentVersion(models.Model): for page in self.pages.all(): page.delete() - self.file.storage.delete(self.file.path) + self.file.storage.delete(self.file.name) return super(DocumentVersion, self).delete(*args, **kwargs) @@ -420,7 +420,7 @@ class DocumentVersion(models.Model): Returns a boolean value that indicates if the document's file exists in storage """ - return self.file.storage.exists(self.file.path) + return self.file.storage.exists(self.file.name) def open(self, raw=False): """ @@ -428,9 +428,9 @@ class DocumentVersion(models.Model): the storage backend """ if raw: - return self.file.storage.open(self.file.path) + return self.file.storage.open(self.file.name) else: - result = self.file.storage.open(self.file.path) + result = self.file.storage.open(self.file.name) for key in sorted(DocumentVersion._pre_open_hooks): result = DocumentVersion._pre_open_hooks[key](result, self) @@ -457,7 +457,7 @@ class DocumentVersion(models.Model): @property def size(self): if self.exists(): - return self.file.storage.size(self.file.path) + return self.file.storage.size(self.file.name) else: return None