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

Update apps for new class based history events

Browse Source
This commit is contained in:
Roberto Rosario
2012-07-06 02:53:38 -04:00
parent f42d681f85
commit 615987366f
8 changed files with 50 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
apps/checkouts/managers.py
View File

@@ -7,17 +7,15 @@ from django.db import models
from django.core.exceptions import PermissionDenied
from documents.models import Document
from history.api import create_history
from permissions.models import Permission
from acls.models import AccessEntry
from .exceptions import DocumentNotCheckedOut
from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN
from .events import (HISTORY_DOCUMENT_CHECKED_IN, HISTORY_DOCUMENT_AUTO_CHECKED_IN,
HISTORY_DOCUMENT_FORCEFUL_CHECK_IN)
from .events import (history_document_checked_in, history_document_auto_checked_in,
history_document_forceful_check_in)
from .permissions import PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE
from history.api import create_history
logger = logging.getLogger(__name__)
@@ -48,11 +46,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})
history_document_forceful_check_in.commit(source_object=document, data={'user': user, 'document': document})
else:
create_history(HISTORY_DOCUMENT_CHECKED_IN, source_object=document, data={'user': user, 'document': document})
history_document_checked_in.commit(source_object=document, data={'user': user, 'document': document})
else:
create_history(HISTORY_DOCUMENT_AUTO_CHECKED_IN, source_object=document, data={'document': document})
history_document_auto_checked_in.commit(source_object=document, data={'document': document})
document_checkout.delete()