From 01fffaa59b31d2097883da1037bbca8986d10b51 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sat, 18 Oct 2014 00:49:49 -0400 Subject: [PATCH] Update auto_now_add and auto_now for the documents app models --- ...datetime_accessed__chg_field_documentve.py | 143 ++++++++++++++++++ mayan/apps/documents/models.py | 10 +- 2 files changed, 146 insertions(+), 7 deletions(-) create mode 100644 mayan/apps/documents/migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py diff --git a/mayan/apps/documents/migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py b/mayan/apps/documents/migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py new file mode 100644 index 0000000000..f8f234ae4c --- /dev/null +++ b/mayan/apps/documents/migrations/0020_auto__chg_field_recentdocument_datetime_accessed__chg_field_documentve.py @@ -0,0 +1,143 @@ +# -*- 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 'RecentDocument.datetime_accessed' + db.alter_column(u'documents_recentdocument', 'datetime_accessed', self.gf('django.db.models.fields.DateTimeField')(auto_now=True)) + + # Changing field 'DocumentVersion.timestamp' + db.alter_column(u'documents_documentversion', 'timestamp', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True)) + # Removing index on 'DocumentVersion', fields ['timestamp'] + db.delete_index(u'documents_documentversion', ['timestamp']) + + + # Changing field 'Document.date_added' + db.alter_column(u'documents_document', 'date_added', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True)) + # Removing index on 'Document', fields ['date_added'] + db.delete_index(u'documents_document', ['date_added']) + + + def backwards(self, orm): + # Adding index on 'Document', fields ['date_added'] + db.create_index(u'documents_document', ['date_added']) + + # Adding index on 'DocumentVersion', fields ['timestamp'] + db.create_index(u'documents_documentversion', ['timestamp']) + + + # Changing field 'RecentDocument.datetime_accessed' + db.alter_column(u'documents_recentdocument', 'datetime_accessed', self.gf('django.db.models.fields.DateTimeField')()) + + # Changing field 'DocumentVersion.timestamp' + db.alter_column(u'documents_documentversion', 'timestamp', self.gf('django.db.models.fields.DateTimeField')()) + + # Changing field 'Document.date_added' + db.alter_column(u'documents_document', 'date_added', self.gf('django.db.models.fields.DateTimeField')()) + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 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', [], {'auto_now_add': 'True', 'blank': '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.documentpage': { + 'Meta': {'ordering': "['page_number']", 'object_name': 'DocumentPage'}, + 'content': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'document_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'pages'", 'to': u"orm['documents.DocumentVersion']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'page_label': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}), + 'page_number': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1', 'db_index': 'True'}) + }, + u'documents.documentpagetransformation': { + 'Meta': {'ordering': "('order',)", 'object_name': 'DocumentPageTransformation'}, + 'arguments': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'document_page': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.DocumentPage']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'order': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'null': 'True', 'db_index': 'True', 'blank': 'True'}), + 'transformation': ('django.db.models.fields.CharField', [], {'max_length': '128'}) + }, + 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'}) + }, + u'documents.documenttypefilename': { + 'Meta': {'ordering': "['filename']", 'object_name': 'DocumentTypeFilename'}, + 'document_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.DocumentType']"}), + 'enabled': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'filename': ('django.db.models.fields.CharField', [], {'max_length': '128', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}) + }, + u'documents.documentversion': { + 'Meta': {'unique_together': "(('document', 'major', 'minor', 'micro', 'release_level', 'serial'),)", 'object_name': 'DocumentVersion'}, + 'checksum': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'versions'", 'to': u"orm['documents.Document']"}), + 'encoding': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + 'filename': ('django.db.models.fields.CharField', [], {'default': "u''", 'max_length': '255', 'db_index': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'major': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'micro': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'minor': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'release_level': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}), + 'serial': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'timestamp': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}) + }, + u'documents.recentdocument': { + 'Meta': {'ordering': "('-datetime_accessed',)", 'object_name': 'RecentDocument'}, + 'datetime_accessed': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'}), + 'document': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.Document']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}) + } + } + + complete_apps = ['documents'] \ No newline at end of file diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index fad4d82689..77d7ee7f9e 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -15,7 +15,6 @@ except ImportError: from django.db import models from django.contrib.auth.models import User from django.core.exceptions import ValidationError -from django.utils.timezone import now from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ @@ -83,7 +82,7 @@ class Document(models.Model): uuid = models.CharField(max_length=48, blank=True, editable=False) document_type = models.ForeignKey(DocumentType, verbose_name=_(u'Document type'), related_name='documents', null=True, blank=True) description = models.TextField(blank=True, null=True, verbose_name=_(u'Description')) - date_added = models.DateTimeField(verbose_name=_(u'Added'), db_index=True, editable=False) + date_added = models.DateTimeField(verbose_name=_(u'Added'), auto_now_add=True) @staticmethod def clear_image_cache(): @@ -113,7 +112,6 @@ class Document(models.Model): new_document = not self.pk if new_document: self.uuid = UUID_FUNCTION() - self.date_added = now() super(Document, self).save(*args, **kwargs) if new_document: @@ -337,7 +335,7 @@ class DocumentVersion(models.Model): micro = models.PositiveIntegerField(verbose_name=_(u'Micro'), default=0) release_level = models.PositiveIntegerField(choices=RELEASE_LEVEL_CHOICES, default=RELEASE_LEVEL_FINAL, verbose_name=_(u'Release level')) serial = models.PositiveIntegerField(verbose_name=_(u'Serial'), default=0) - timestamp = models.DateTimeField(verbose_name=_(u'Timestamp'), editable=False, db_index=True) + timestamp = models.DateTimeField(verbose_name=_(u'Timestamp'), auto_now_add=True) comment = models.TextField(blank=True, verbose_name=_(u'Comment')) # File related fields @@ -395,8 +393,6 @@ class DocumentVersion(models.Model): mimetype, page count and transformation when created """ new_document = not self.pk - if not self.pk: - self.timestamp = now() # Only do this for new documents transformations = kwargs.pop('transformations', None) @@ -672,7 +668,7 @@ class RecentDocument(models.Model): """ user = models.ForeignKey(User, verbose_name=_(u'User'), editable=False) document = models.ForeignKey(Document, verbose_name=_(u'Document'), editable=False) - datetime_accessed = models.DateTimeField(verbose_name=_(u'Accessed'), default=lambda: now(), db_index=True) + datetime_accessed = models.DateTimeField(verbose_name=_(u'Accessed'), auto_now=True, db_index=True) objects = RecentDocumentManager()