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

Initial commit of the new events app

Browse Source
This commit is contained in:
Roberto Rosario
2015-01-10 19:01:57 -04:00
parent 9c0f8feaed
commit bbab21d228
23 changed files with 179 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/checkouts/managers.py
+6 -7
View File
@@ -8,12 +8,11 @@ from django.utils.timezone import now
from acls.models import AccessEntry
from documents.models import Document
from history.api import create_history
from permissions.models import Permission
from .events import (HISTORY_DOCUMENT_AUTO_CHECKED_IN,
HISTORY_DOCUMENT_CHECKED_IN,
HISTORY_DOCUMENT_FORCEFUL_CHECK_IN)
from .events import (event_document_auto_check_in,
event_document_check_in,
event_document_forceful_check_in)
from .exceptions import DocumentNotCheckedOut
from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN
from .permissions import PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE
@@ -48,11 +47,11 @@ class DocumentCheckoutManager(models.Manager):
else:
if user:
if self.document_checkout_info(document).user_object != user:
create_history(HISTORY_DOCUMENT_FORCEFUL_CHECK_IN, source_object=document, data={'user': user, 'document': document})
event_document_forceful_check_in.commit(actor=user, target=document)
else:
create_history(HISTORY_DOCUMENT_CHECKED_IN, source_object=document, data={'user': user, 'document': document})
event_document_check_in.commit(actor=user, target=document)
else:
create_history(HISTORY_DOCUMENT_AUTO_CHECKED_IN, source_object=document, data={'document': document})
event_document_auto_check_in.commit(target=document)
document_checkout.delete()