matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix document delete regresion

Browse Source
This commit is contained in:
Roberto Rosario
2011-12-07 04:22:34 -04:00
parent bee7567327
commit 6bf8a3df10
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/documents/models.py
View File

@@ -176,12 +176,10 @@ class Document(models.Model):
def add_as_recent_document_for_user(self, user):
RecentDocument.objects.add_document_for_user(user, self)
# TODO: investigate if Document's save method calls all of it
# DocumentVersion's delete methods
#def delete(self, *args, **kwargs):
# super(Document, self).delete(*args, **kwargs)
# for version in self.documentversion_set.all():
# version.file.storage.delete(version.file.path)
def delete(self, *args, **kwargs):
for version in self.versions.all():
version.delete()
return super(Document, self).delete(*args, **kwargs)
@property
def size(self):
@@ -497,8 +495,8 @@ class DocumentVersion(models.Model):
self.save()
def delete(self, *args, **kwargs):
super(DocumentVersion, self).delete(*args, **kwargs)
return self.file.storage.delete(self.file.path)
self.file.storage.delete(self.file.path)
return super(DocumentVersion, self).delete(*args, **kwargs)
def exists(self):
'''

2
apps/documents/views.py
View File

@@ -198,7 +198,7 @@ def document_delete(request, document_id=None, document_id_list=None):
document.delete()
#create_history(HISTORY_DOCUMENT_DELETED, data={'user': request.user, 'document': document})
messages.success(request, _(u'Document: %s deleted successfully.') % document)
messages.success(request, _(u'Document deleted successfully.'))
except Exception, e:
messages.error(request, _(u'Document: %(document)s delete error: %(error)s') % {
'document': document, 'error': e