diff --git a/apps/checkouts/__init__.py b/apps/checkouts/__init__.py index 35895abc21..0f4ac609ad 100644 --- a/apps/checkouts/__init__.py +++ b/apps/checkouts/__init__.py @@ -17,7 +17,8 @@ from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, from .links import checkout_list, checkout_document, checkout_info, checkin_document from .models import DocumentCheckout from .tasks import task_check_expired_check_outs -from .events import HISTORY_DOCUMENT_CHECKED_OUT, HISTORY_DOCUMENT_CHECKED_IN +from .events import (HISTORY_DOCUMENT_CHECKED_OUT, HISTORY_DOCUMENT_CHECKED_IN, + HISTORY_DOCUMENT_AUTO_CHECKED_IN, HISTORY_DOCUMENT_FORCEFUL_CHECK_IN) def initialize_document_checkout_extra_methods(): @@ -43,6 +44,8 @@ register_interval_job('task_check_expired_check_outs', _(u'Check expired check o initialize_document_checkout_extra_methods() register_history_type(HISTORY_DOCUMENT_CHECKED_OUT) register_history_type(HISTORY_DOCUMENT_CHECKED_IN) +register_history_type(HISTORY_DOCUMENT_AUTO_CHECKED_IN) +register_history_type(HISTORY_DOCUMENT_FORCEFUL_CHECK_IN) #TODO: forcefull check in & history #TODO: history for auto check in diff --git a/apps/checkouts/events.py b/apps/checkouts/events.py index 6d91d8d4ea..111c4e981b 100644 --- a/apps/checkouts/events.py +++ b/apps/checkouts/events.py @@ -13,3 +13,16 @@ HISTORY_DOCUMENT_CHECKED_IN = { 'summary': _(u'Document "%(document)s" checked in by %(fullname)s.'), 'expressions': {'fullname': 'user.get_full_name() if user.get_full_name() else user'} } + +HISTORY_DOCUMENT_AUTO_CHECKED_IN = { + 'namespace': 'checkouts', 'name': 'document_auto_checked_in', + 'label': _(u'Document automatically checked in'), + 'summary': _(u'Document "%(document)s" automatically checked in.'), +} + +HISTORY_DOCUMENT_FORCEFUL_CHECK_IN = { + 'namespace': 'checkouts', 'name': 'document_forefull_check_in', + 'label': _(u'Document forefully checked in'), + 'summary': _(u'Document "%(document)s" forcefully checked in.'), + 'expressions': {'fullname': 'user.get_full_name() if user.get_full_name() else user'} +}