Finish the move to the new events app

mayan/apps/documents/__init__.py

@@ -8,7 +8,7 @@ from acls.api import class_permissions
 from common.classes import ModelAttribute
 from common.utils import encapsulate, validate_path
 from dynamic_search.classes import SearchModel
-from history.permissions import PERMISSION_HISTORY_VIEW
+from events.permissions import PERMISSION_EVENTS_VIEW
 from main.api import register_maintenance_links
 from navigation.api import (register_links, register_model_list_columns)
 from navigation.links import link_spacer
@@ -21,8 +21,9 @@ from .links import (document_clear_image_cache,
                     document_clear_transformations, document_content,
                     document_delete,
                     document_document_type_edit,
+                    document_events_view,
                     document_multiple_document_type_edit, document_download,
-                    document_edit, document_history_view, document_list,
+                    document_edit, document_list,
                     document_list_recent, document_multiple_delete,
                     document_multiple_clear_transformations,
                     document_multiple_download,
@@ -72,8 +73,7 @@ register_links([Document], [document_multiple_clear_transformations, document_mu
 register_links(Document, [document_preview], menu_name='form_header', position=0)
 register_links(Document, [document_content], menu_name='form_header', position=1)
 register_links(Document, [document_properties], menu_name='form_header', position=2)
-register_links(Document, [document_history_view], menu_name='form_header')
-register_links(Document, [document_version_list], menu_name='form_header')
+register_links(Document, [document_events_view, document_version_list], menu_name='form_header')
 
 # Document Version links
 register_links(DocumentVersion, [document_version_revert, document_version_download])
@@ -124,7 +124,7 @@ class_permissions(Document, [PERMISSION_DOCUMENT_DELETE,
                              PERMISSION_DOCUMENT_TRANSFORM,
                              PERMISSION_DOCUMENT_VERSION_REVERT,
                              PERMISSION_DOCUMENT_VIEW,
-                             PERMISSION_HISTORY_VIEW])
+                             PERMISSION_EVENTS_VIEW])
 
 document_search = SearchModel('documents', 'Document', permission=PERMISSION_DOCUMENT_VIEW, serializer_string='documents.serializers.DocumentSerializer')
 

mayan/apps/documents/events.py

@@ -5,23 +5,4 @@ from django.utils.translation import ugettext_lazy as _
 from events.classes import Event
 
 event_document_create = Event(name='documents_document_create', label=_('Document created'))
-
-HISTORY_DOCUMENT_CREATED = {
-    'namespace': 'documents', 'name': 'document_created',
-    'label': _(u'Document creation'),
-    'summary': _(u'Document "%(content_object)s" created by %(fullname)s.'),
-    'details': _(u'Document "%(content_object)s" created on %(datetime)s by %(fullname)s.'),
-    'expressions': {'fullname': 'user[0]["fields"]["username"] if isinstance(user, list) else user.get_full_name() if user.get_full_name() else user.username'}
-}
-
 event_document_edited = Event(name='documents_document_edit', label=_('Document edited'))
-
-HISTORY_DOCUMENT_EDITED = {
-    'namespace': 'documents', 'name': 'document_edited',
-    'label': _(u'Document edited'),
-    'summary': _(u'Document "%(content_object)s" edited by %(fullname)s.'),
-    'details': _(u'Document "%(content_object)s" was edited on %(datetime)s by %(fullname)s.'),
-    'expressions': {
-        'fullname': 'user[0]["fields"]["username"] if isinstance(user, list) else user.get_full_name() if user.get_full_name() else user.username',
-    }
-}

mayan/apps/documents/links.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from history.permissions import PERMISSION_HISTORY_VIEW
+from events.permissions import PERMISSION_EVENTS_VIEW
 
 from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
                           PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_DELETE,
@@ -54,7 +54,7 @@ document_multiple_update_page_count = {'text': _(u'Reset page count'), 'view': '
 document_clear_transformations = {'text': _(u'Clear transformations'), 'view': 'documents:document_clear_transformations', 'args': 'object.id', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]}
 document_multiple_clear_transformations = {'text': _(u'Clear transformations'), 'view': 'documents:document_multiple_clear_transformations', 'famfam': 'page_paintbrush', 'permissions': [PERMISSION_DOCUMENT_TRANSFORM]}
 document_print = {'text': _(u'Print'), 'view': 'documents:document_print', 'args': 'object.id', 'famfam': 'printer', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
-document_history_view = {'text': _(u'History'), 'view': 'history:history_for_object', 'args': ['"documents"', '"document"', 'object.id'], 'famfam': 'book_go', 'permissions': [PERMISSION_HISTORY_VIEW]}
+document_events_view = {'text': _(u'Events'), 'view': 'events:events_for_object', 'args': ['"documents"', '"document"', 'object.id'], 'famfam': 'book_go', 'permissions': [PERMISSION_EVENTS_VIEW]}
 
 # Tools
 document_clear_image_cache = {'text': _(u'Clear the document image cache'), 'view': 'documents:document_clear_image_cache', 'famfam': 'camera_delete', 'permissions': [PERMISSION_DOCUMENT_TOOLS], 'description': _(u'Clear the graphics representations used to speed up the documents\' display and interactive transformations results.')}

mayan/apps/documents/views.py

@@ -237,7 +237,7 @@ def document_edit(request, document_id):
                     document.label = form.cleaned_data['document_type_available_filenames'].filename
 
             document.save()
-            event_document_edited.commit(actor=request.user)
+            event_document_edited.commit(actor=request.user, target=document)
             document.add_as_recent_document_for_user(request.user)
 
             messages.success(request, _(u'Document "%s" edited successfully.') % document)
@@ -279,7 +279,7 @@ def document_document_type_edit(request, document_id=None, document_id_list=None
 
             for document in documents:
                 document.set_document_type(form.cleaned_data['document_type'])
-                event_document_edited.commit(actor=request.user)
+                event_document_edited.commit(actor=request.user, target=document)
                 document.add_as_recent_document_for_user(request.user)
 
             messages.success(request, _(u'Document type changed successfully.'))