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

Change the user_object of the DocumentCheckout model to be just a FK to the User model

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-16 23:35:23 -04:00
parent 0e52609c7c
commit 91150a7f51
9 changed files with 90 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mayan/apps/checkouts/managers.py
View File

@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
class DocumentCheckoutManager(models.Manager):
def checkout_document(self, document, expiration_datetime, user, block_new_version=True):
self.create(document=document, expiration_datetime=expiration_datetime, user_object=user, block_new_version=block_new_version)
self.create(document=document, expiration_datetime=expiration_datetime, user=user, block_new_version=block_new_version)
def checked_out_documents(self):
return Document.objects.filter(pk__in=self.model.objects.all().values_list('document__pk', flat=True))
@@ -49,7 +49,7 @@ class DocumentCheckoutManager(models.Manager):
raise DocumentNotCheckedOut
else:
if user:
if self.document_checkout_info(document).user_object != user:
if self.document_checkout_info(document).user != user:
event_document_forceful_check_in.commit(actor=user, target=document)
else:
event_document_check_in.commit(actor=user, target=document)