Convert the checkout detail view to use the DetailView CBV. Update usage the DetailView CBV in the DocumentProperties view. Add checkout details view permission.

mayan/apps/documents/forms.py

@@ -4,6 +4,7 @@ import logging
 
 from django import forms
 from django.core.exceptions import PermissionDenied
+from django.template.defaultfilters import filesizeformat
 from django.utils.translation import ugettext_lazy as _
 
 from acls.models import AccessControlList
@@ -101,6 +102,48 @@ class DocumentPropertiesForm(DetailForm):
     """
     Detail class form to display a document file based properties
     """
+    def __init__(self, *args, **kwargs):
+        document = kwargs['instance']
+
+        extra_fields = [
+            {
+                'label': _('Date added'),
+                'field': 'date_added',
+                'widget': forms.widgets.DateTimeInput
+            },
+            {'label': _('UUID'), 'field': 'uuid'},
+        ]
+
+        if document.latest_version:
+            extra_fields += (
+                {
+                    'label': _('File mimetype'),
+                    'field': lambda x: document.file_mimetype or _('None')
+                },
+                {
+                    'label': _('File encoding'),
+                    'field': lambda x: document.file_mime_encoding or _(
+                        'None'
+                    )
+                },
+                {
+                    'label': _('File size'),
+                    'field': lambda document: filesizeformat(
+                        document.size
+                    ) if document.size else '-'
+                },
+                {'label': _('Exists in storage'), 'field': 'exists'},
+                {
+                    'label': _('File path in storage'),
+                    'field': 'latest_version.file'
+                },
+                {'label': _('Checksum'), 'field': 'checksum'},
+                {'label': _('Pages'), 'field': 'page_count'},
+            )
+
+        kwargs['extra_fields'] = extra_fields
+        super(DocumentPropertiesForm, self).__init__(*args, **kwargs)
+
     class Meta:
         fields = ('document_type', 'description', 'language')
         model = Document

mayan/apps/documents/views.py

@@ -22,7 +22,6 @@ from common.generics import (
     SingleObjectDetailView, SingleObjectEditView, SingleObjectListView
 )
 from common.mixins import MultipleInstanceActionMixin
-from common.utils import render_date_object
 from converter.literals import (
     DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL
 )
@@ -533,6 +532,7 @@ class DocumentVersionListView(SingleObjectListView):
 
 
 class DocumentView(SingleObjectDetailView):
+    form_class = DocumentPropertiesForm
     model = Document
     object_permission = permission_document_view
 
@@ -543,55 +543,11 @@ class DocumentView(SingleObjectDetailView):
 
     def get_extra_context(self):
         return {
-            'form': self.get_form(),
             'document': self.get_object(),
             'object': self.get_object(),
             'title': _('Properties for document: %s') % self.get_object(),
         }
 
-    def get_form(self):
-        document = self.get_object()
-
-        document_fields = [
-            {
-                'label': _('Date added'),
-                'field': lambda document: render_date_object(
-                    document.date_added
-                )
-            },
-            {'label': _('UUID'), 'field': 'uuid'},
-        ]
-        if document.latest_version:
-            document_fields.extend([
-                {
-                    'label': _('File mimetype'),
-                    'field': lambda x: document.file_mimetype or _('None')
-                },
-                {
-                    'label': _('File encoding'),
-                    'field': lambda x: document.file_mime_encoding or _(
-                        'None'
-                    )
-                },
-                {
-                    'label': _('File size'),
-                    'field': lambda document: filesizeformat(
-                        document.size
-                    ) if document.size else '-'
-                },
-                {'label': _('Exists in storage'), 'field': 'exists'},
-                {
-                    'label': _('File path in storage'),
-                    'field': 'latest_version.file'
-                },
-                {'label': _('Checksum'), 'field': 'checksum'},
-                {'label': _('Pages'), 'field': 'page_count'},
-            ])
-
-        return DocumentPropertiesForm(
-            instance=document, extra_fields=document_fields
-        )
-
 
 class EmptyTrashCanView(ConfirmView):
     extra_context = {