Only impose check out limitations to non original user and not admin, add checkout limitation overriding permission

This commit is contained in:
Roberto Rosario
2012-06-17 01:08:47 -04:00
parent d34714bafa
commit 4bf6310d1d
6 changed files with 44 additions and 18 deletions

View File

@@ -176,10 +176,7 @@ def upload_interactive(request, source_type=None, source_id=None, document_pk=No
return HttpResponseRedirect(request.get_full_path())
except NewDocumentVersionNotAllowed:
if not document.is_new_versions_allowed():
messages.error(request, _(u'The check out options for document currently don\'t allow new version uploads.'))
else:
messages.error(request, _(u'This document currently don\'t allow new version uploads.'))
messages.error(request, _(u'New version uploads are not allowed for this document.'))
except Exception, e:
if settings.DEBUG:
raise
@@ -260,10 +257,7 @@ def upload_interactive(request, source_type=None, source_id=None, document_pk=No
else:
return HttpResponseRedirect(request.get_full_path())
except NewDocumentVersionNotAllowed:
if not document.is_new_versions_allowed:
messages.error(request, _(u'The check out options for document currently don\'t allow new version uploads.'))
else:
messages.error(request, _(u'This document currently don\'t allow new version uploads.'))
messages.error(request, _(u'New version uploads are not allowed for this document.'))
except Exception, e:
if settings.DEBUG:
raise