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

Issue #8, finish adding view and links to change a document's type

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-28 02:01:22 -04:00
parent ea68e195b1
commit 6aecfd98e6
4 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/documents/__init__.py
View File

@@ -22,7 +22,7 @@ from .events import (HISTORY_DOCUMENT_CREATED,
HISTORY_DOCUMENT_DELETED, HISTORY_DOCUMENT_EDITED)
from .links import (document_clear_image_cache,
document_clear_transformations, document_delete,
document_download, document_edit,
document_document_type, document_download, document_edit,
document_history_view, document_list,
document_list_recent, document_missing_list,
document_multiple_delete,
@@ -76,7 +76,7 @@ register_links(['documents:setup_document_type_metadata', 'documents:document_ty
register_links([DocumentTypeFilename, 'documents:document_type_filename_list', 'documents:document_type_filename_create'], [document_type_filename_create], menu_name='sidebar')
# Register document links
register_links(Document, [document_view_simple, document_edit, document_print, document_delete, document_download, document_clear_transformations, document_update_page_count])
register_links(Document, [document_view_simple, document_edit, document_document_type, document_print, document_delete, document_download, document_clear_transformations, document_update_page_count])
register_links([Document], [link_spacer, document_multiple_clear_transformations, document_multiple_delete, document_multiple_download, document_multiple_update_page_count], menu_name='multi_item_links')
# Document Version links

1
mayan/apps/documents/links.py
View File

@@ -43,6 +43,7 @@ document_view_advanced = {'text': _(u'Properties'), 'view': 'documents:document_
document_delete = {'text': _(u'Delete'), 'view': 'documents:document_delete', 'args': 'object.id', 'famfam': 'page_delete', 'permissions': [PERMISSION_DOCUMENT_DELETE]}
document_multiple_delete = {'text': _(u'Delete'), 'view': 'documents:document_multiple_delete', 'famfam': 'page_delete', 'permissions': [PERMISSION_DOCUMENT_DELETE]}
document_edit = {'text': _(u'Edit properties'), 'view': 'documents:document_edit', 'args': 'object.id', 'famfam': 'page_edit', 'permissions': [PERMISSION_DOCUMENT_PROPERTIES_EDIT]}
document_document_type = {'text': _(u'Change type'), 'view': 'documents:document_document_type', 'args': 'object.id', 'famfam': 'layout', 'permissions': [PERMISSION_DOCUMENT_PROPERTIES_EDIT]}
document_download = {'text': _(u'Download'), 'view': 'documents:document_download', 'args': 'object.id', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]}
document_multiple_download = {'text': _(u'Download'), 'view': 'documents:document_multiple_download', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]}
document_version_download = {'text': _(u'Download'), 'view': 'documents:document_version_download', 'args': 'object.pk', 'famfam': 'page_save', 'permissions': [PERMISSION_DOCUMENT_DOWNLOAD]}

1
mayan/apps/documents/urls.py
View File

@@ -16,6 +16,7 @@ urlpatterns = patterns('documents.views',
url(r'^(?P<document_id>\d+)/view/$', 'document_view', (), 'document_view_simple'),
url(r'^(?P<document_id>\d+)/view/advanced/$', 'document_view', {'advanced': True}, 'document_view_advanced'),
url(r'^(?P<document_id>\d+)/type/$', 'document_document_type', name='document_document_type'),
url(r'^(?P<document_id>\d+)/delete/$', 'document_delete', (), 'document_delete'),
url(r'^multiple/delete/$', 'document_multiple_delete', (), 'document_multiple_delete'),
url(r'^(?P<document_id>\d+)/edit/$', 'document_edit', (), 'document_edit'),

40
mayan/apps/documents/views.py
View File

@@ -31,12 +31,13 @@ from navigation.utils import resolve_to_name
from permissions.models import Permission
from .events import HISTORY_DOCUMENT_EDITED
from .forms import (DocumentForm, DocumentPropertiesForm,
DocumentPreviewForm, DocumentPageForm,
DocumentPageTransformationForm, DocumentContentForm,
DocumentPageForm_edit, DocumentPageForm_text, PrintForm,
from .forms import (DocumentContentForm, DocumentDownloadForm, DocumentForm,
DocumentPageForm, DocumentPageForm_edit,
DocumentPageForm_text, DocumentPageTransformationForm,
DocumentPreviewForm, DocumentPropertiesForm,
DocumentTypeForm, DocumentTypeFilenameForm,
DocumentTypeFilenameForm_create, DocumentDownloadForm)
DocumentTypeFilenameForm_create, DocumentTypeSelectForm,
PrintForm)
from .models import (Document, DocumentType, DocumentPage,
DocumentPageTransformation, DocumentTypeFilename,
DocumentVersion, RecentDocument)
@@ -256,6 +257,35 @@ def document_edit(request, document_id):
}, context_instance=RequestContext(request))
def document_document_type(request, document_id):
document = get_object_or_404(Document, pk=document_id)
try:
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_PROPERTIES_EDIT])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_DOCUMENT_PROPERTIES_EDIT, request.user, document)
if request.method == 'POST':
form = DocumentTypeSelectForm(request.POST)
if form.is_valid():
document.set_document_type(form.cleaned_data['document_type'])
create_history(HISTORY_DOCUMENT_EDITED, document, {'user': request.user})
document.add_as_recent_document_for_user(request.user)
messages.success(request, _(u'Document type for document "%s" changed successfully.') % document)
return HttpResponseRedirect(document.get_absolute_url())
else:
form = DocumentTypeSelectForm(initial={'document_type': document.document_type})
return render_to_response('main/generic_form.html', {
'form': form,
'object': document,
'title': _('Change document type of: %s') % document,
'submit_label': _('Submit'),
}, context_instance=RequestContext(request))
# TODO: Get rid of this view and convert widget to use API and base64 only images
def get_document_image(request, document_id, size=PREVIEW_SIZE):
document = get_object_or_404(Document, pk=document_id)