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

Make sure processing documents cannot be deleted

Browse Source
This commit is contained in:
Roberto Rosario
2011-04-24 04:42:49 -04:00
parent c505dad667
commit d33ced5e34
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/ocr/views.py
+10 -7
View File
@@ -82,9 +82,12 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis
if request.method == 'POST': if request.method == 'POST':
for queue_document in queue_documents: for queue_document in queue_documents:
try: try:
queue_document.delete() if queue_document.state == QUEUEDOCUMENT_STATE_PROCESSING:
messages.success(request, _(u'Document: %(document)s deleted successfully.') % { messages.error(request, _(u'Document: %s is being processed and can\'t be deleted.') % queue_document)
'document': queue_document.document}) else:
queue_document.delete()
messages.success(request, _(u'Queue document: %(document)s deleted successfully.') % {
'document': queue_document.document})
except Exception, e: except Exception, e:
messages.error(request, _(u'Error deleting document: %(document)s; %(error)s') % { messages.error(request, _(u'Error deleting document: %(document)s; %(error)s') % {
@@ -99,9 +102,9 @@ def queue_document_delete(request, queue_document_id=None, queue_document_id_lis
if len(queue_documents) == 1: if len(queue_documents) == 1:
context['object'] = queue_documents[0] context['object'] = queue_documents[0]
context['title'] = _(u'Are you sure you with to delete from queue document: %s?') % ', '.join([unicode(d) for d in queue_documents]) context['title'] = _(u'Are you sure you wish to delete from queue document: %s?') % ', '.join([unicode(d) for d in queue_documents])
elif len(queue_documents) > 1: elif len(queue_documents) > 1:
context['title'] = _(u'Are you sure you with to delete from queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents]) context['title'] = _(u'Are you sure you wish to delete from queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents])
return render_to_response('generic_confirm.html', context, return render_to_response('generic_confirm.html', context,
context_instance=RequestContext(request)) context_instance=RequestContext(request))
@@ -188,9 +191,9 @@ def re_queue_document(request, queue_document_id=None, queue_document_id_list=No
if len(queue_documents) == 1: if len(queue_documents) == 1:
context['object'] = queue_documents[0] context['object'] = queue_documents[0]
context['title'] = _(u'Are you sure you with to re-queue document: %s?') % ', '.join([unicode(d) for d in queue_documents]) context['title'] = _(u'Are you sure you wish to re-queue document: %s?') % ', '.join([unicode(d) for d in queue_documents])
elif len(queue_documents) > 1: elif len(queue_documents) > 1:
context['title'] = _(u'Are you sure you with to re-queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents]) context['title'] = _(u'Are you sure you wish to re-queue documents: %s?') % ', '.join([unicode(d) for d in queue_documents])
return render_to_response('generic_confirm.html', context, return render_to_response('generic_confirm.html', context,
context_instance=RequestContext(request)) context_instance=RequestContext(request))