Evaluation error don't raise exception anymore and are only show to administrative users
This commit is contained in:
@@ -117,11 +117,15 @@ def _handle_save_document(request, document, form=None):
|
|||||||
|
|
||||||
save_metadata_list(decode_metadata_from_url(request.GET), document)
|
save_metadata_list(decode_metadata_from_url(request.GET), document)
|
||||||
try:
|
try:
|
||||||
document_create_fs_links(document)
|
warnings = document_create_fs_links(document)
|
||||||
|
if request.user.is_staff or request.user.is_superuser:
|
||||||
|
for warning in warnings:
|
||||||
|
messages.warning(request, warning)
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
messages.error(request, e)
|
messages.error(request, e)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def _handle_zip_file(request, uploaded_file, document_type):
|
def _handle_zip_file(request, uploaded_file, document_type):
|
||||||
filename = getattr(uploaded_file, 'filename', getattr(uploaded_file, 'name', ''))
|
filename = getattr(uploaded_file, 'filename', getattr(uploaded_file, 'name', ''))
|
||||||
if filename.lower().endswith('zip'):
|
if filename.lower().endswith('zip'):
|
||||||
@@ -382,7 +386,12 @@ def document_edit(request, document_id):
|
|||||||
messages.success(request, _(u'Document %s edited successfully.') % document)
|
messages.success(request, _(u'Document %s edited successfully.') % document)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
document_create_fs_links(document)
|
warnings = document_create_fs_links(document)
|
||||||
|
|
||||||
|
if request.user.is_staff or request.user.is_superuser:
|
||||||
|
for warning in warnings:
|
||||||
|
messages.warning(request, warning)
|
||||||
|
|
||||||
messages.success(request, _(u'Document filesystem links updated successfully.'))
|
messages.success(request, _(u'Document filesystem links updated successfully.'))
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
messages.error(request, e)
|
messages.error(request, e)
|
||||||
@@ -433,7 +442,12 @@ def document_edit_metadata(request, document_id):
|
|||||||
messages.success(request, _(u'Metadata for document %s edited successfully.') % document)
|
messages.success(request, _(u'Metadata for document %s edited successfully.') % document)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
document_create_fs_links(document)
|
warnings = document_create_fs_links(document)
|
||||||
|
|
||||||
|
if request.user.is_staff or request.user.is_superuser:
|
||||||
|
for warning in warnings:
|
||||||
|
messages.warning(request, warning)
|
||||||
|
|
||||||
messages.success(request, _(u'Document filesystem links updated successfully.'))
|
messages.success(request, _(u'Document filesystem links updated successfully.'))
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
messages.error(request, e)
|
messages.error(request, e)
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ if SLUGIFY_PATHS == False:
|
|||||||
|
|
||||||
|
|
||||||
def document_create_fs_links(document):
|
def document_create_fs_links(document):
|
||||||
|
warnings = []
|
||||||
if FILESERVING_ENABLE:
|
if FILESERVING_ENABLE:
|
||||||
if not document.exists():
|
if not document.exists():
|
||||||
raise Exception(_(u'Not creating metadata indexing, document not found in document storage'))
|
raise Exception(_(u'Not creating metadata indexing, document not found in document storage'))
|
||||||
@@ -39,12 +40,14 @@ def document_create_fs_links(document):
|
|||||||
|
|
||||||
next_available_filename(document, metadata_index, target_directory, slugify(document.file_filename), slugify(document.file_extension))
|
next_available_filename(document, metadata_index, target_directory, slugify(document.file_filename), slugify(document.file_extension))
|
||||||
except NameError, exc:
|
except NameError, exc:
|
||||||
raise NameError(_(u'Error in metadata indexing expression: %s') % exc)
|
warnings.append(_(u'Error in metadata indexing expression: %s') % exc)
|
||||||
|
#raise NameError()
|
||||||
#This should be a warning not an error
|
#This should be a warning not an error
|
||||||
#pass
|
#pass
|
||||||
except Exception, exc:
|
except Exception, exc:
|
||||||
raise Exception(_(u'Unable to create metadata indexing directory: %s') % exc)
|
raise Exception(_(u'Unable to create metadata indexing directory: %s') % exc)
|
||||||
|
|
||||||
|
return warnings
|
||||||
|
|
||||||
def document_delete_fs_links(document):
|
def document_delete_fs_links(document):
|
||||||
if FILESERVING_ENABLE:
|
if FILESERVING_ENABLE:
|
||||||
@@ -143,13 +146,13 @@ def do_recreate_all_links(raise_exception=True):
|
|||||||
|
|
||||||
for document in Document.objects.all():
|
for document in Document.objects.all():
|
||||||
try:
|
try:
|
||||||
document_create_fs_links(document)
|
create_warnings = document_create_fs_links(document)
|
||||||
except NameError, e:
|
|
||||||
warnings.append('%s: %s' % (document, e))
|
|
||||||
except Exception, e:
|
except Exception, e:
|
||||||
if raise_exception:
|
if raise_exception:
|
||||||
raise Exception(e)
|
raise Exception(e)
|
||||||
else:
|
else:
|
||||||
errors.append('%s: %s' % (document, e))
|
errors.append('%s: %s' % (document, e))
|
||||||
|
|
||||||
|
for warning in create_warnings:
|
||||||
|
warnings.append('%s: %s' % (document, e))
|
||||||
return errors, warnings
|
return errors, warnings
|
||||||
|
|||||||
Reference in New Issue
Block a user