From 1b3233a1b0ec04e3b8f271cde586fb6d656fdbc5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 18 Oct 2014 00:42:45 -0400 Subject: [PATCH] Use auto_now_add --- ...ield_documentcheckout_checkout_datetime.py | 53 +++++++++++++++++++ mayan/apps/checkouts/models.py | 4 +- 2 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 mayan/apps/checkouts/migrations/0003_auto__chg_field_documentcheckout_checkout_datetime.py diff --git a/mayan/apps/checkouts/migrations/0003_auto__chg_field_documentcheckout_checkout_datetime.py b/mayan/apps/checkouts/migrations/0003_auto__chg_field_documentcheckout_checkout_datetime.py new file mode 100644 index 0000000000..b0f89c258f --- /dev/null +++ b/mayan/apps/checkouts/migrations/0003_auto__chg_field_documentcheckout_checkout_datetime.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Changing field 'DocumentCheckout.checkout_datetime' + db.alter_column(u'checkouts_documentcheckout', 'checkout_datetime', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2014, 10, 18, 0, 0))) + + def backwards(self, orm): + + # Changing field 'DocumentCheckout.checkout_datetime' + db.alter_column(u'checkouts_documentcheckout', 'checkout_datetime', self.gf('django.db.models.fields.DateTimeField')(null=True)) + + models = { + u'checkouts.documentcheckout': { + 'Meta': {'object_name': 'DocumentCheckout'}, + 'block_new_version': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'checkout_datetime': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.Document']", 'unique': 'True'}), + 'expiration_datetime': ('django.db.models.fields.DateTimeField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user_content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}), + 'user_object_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + u'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + u'documents.document': { + 'Meta': {'ordering': "['-date_added']", 'object_name': 'Document'}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'document_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'documents'", 'null': 'True', 'to': u"orm['documents.DocumentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'max_length': '48', 'blank': 'True'}) + }, + u'documents.documenttype': { + 'Meta': {'ordering': "['name']", 'object_name': 'DocumentType'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}) + } + } + + complete_apps = ['checkouts'] \ No newline at end of file diff --git a/mayan/apps/checkouts/models.py b/mayan/apps/checkouts/models.py index 86f629a589..a0c68b36e4 100644 --- a/mayan/apps/checkouts/models.py +++ b/mayan/apps/checkouts/models.py @@ -22,7 +22,7 @@ class DocumentCheckout(models.Model): Model to store the state and information of a document checkout """ document = models.ForeignKey(Document, verbose_name=_(u'Document'), unique=True) - checkout_datetime = models.DateTimeField(verbose_name=_(u'Check out date and time'), blank=True, null=True) + checkout_datetime = models.DateTimeField(verbose_name=_(u'Check out date and time'), auto_now_add=True) expiration_datetime = models.DateTimeField(verbose_name=_(u'Check out expiration date and time'), help_text=_(u'Amount of time to hold the document checked out in minutes.')) user_content_type = models.ForeignKey(ContentType, null=True, blank=True) # blank and null added for ease of db migration user_object_id = models.PositiveIntegerField(null=True, blank=True) @@ -40,8 +40,6 @@ class DocumentCheckout(models.Model): return unicode(self.document) def save(self, *args, **kwargs): - if not self.pk: - self.checkout_datetime = now() result = super(DocumentCheckout, self).save(*args, **kwargs) create_history(HISTORY_DOCUMENT_CHECKED_OUT, source_object=self.document, data={'user': self.user_object, 'document': self.document}) return result