From 8194e898a0a9588cc52741b3dedce66ab69d5e9a Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 11 Nov 2014 04:23:31 -0400 Subject: [PATCH] Make the title field of the MetatadaType model a required field --- mayan/apps/metadata/models.py | 4 +- ...0009_auto__chg_field_metadatatype_title.py | 61 +++++++++++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py index 1a48c61cdd..b73100878b 100644 --- a/mayan/apps/metadata/models.py +++ b/mayan/apps/metadata/models.py @@ -14,7 +14,7 @@ class MetadataType(models.Model): Define a type of metadata """ name = models.CharField(unique=True, max_length=48, verbose_name=_(u'Name'), help_text=_(u'Do not use python reserved words, or spaces.')) - title = models.CharField(max_length=48, verbose_name=_(u'Title'), blank=True, null=True) + title = models.CharField(max_length=48, verbose_name=_(u'Title')) default = models.CharField(max_length=128, blank=True, null=True, verbose_name=_(u'Default'), help_text=_(u'Enter a string to be evaluated.')) @@ -29,7 +29,7 @@ class MetadataType(models.Model): objects = MetadataTypeManager() def __unicode__(self): - return self.title if self.title else self.name + return self.title def natural_key(self): return (self.name,) diff --git a/mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py b/mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py new file mode 100644 index 0000000000..cee64e15a1 --- /dev/null +++ b/mayan/apps/metadata/south_migrations/0009_auto__chg_field_metadatatype_title.py @@ -0,0 +1,61 @@ +# -*- 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 'MetadataType.title' + db.alter_column(u'metadata_metadatatype', 'title', self.gf('django.db.models.fields.CharField')(default='', max_length=48)) + + def backwards(self, orm): + + # Changing field 'MetadataType.title' + db.alter_column(u'metadata_metadatatype', 'title', self.gf('django.db.models.fields.CharField')(max_length=48, null=True)) + + models = { + 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', [], {'related_name': "'documents'", 'to': u"orm['documents.DocumentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'default': "u'Uninitialized document'", 'max_length': '255', 'db_index': 'True'}), + 'language': ('django.db.models.fields.CharField', [], {'default': "u'eng'", 'max_length': '8'}), + 'uuid': ('django.db.models.fields.CharField', [], {'default': "u'473b4653-adff-407a-90bf-35d290a168fb'", 'max_length': '48'}) + }, + 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'}), + 'ocr': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) + }, + u'metadata.documentmetadata': { + 'Meta': {'object_name': 'DocumentMetadata'}, + 'document': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'document_metadata'", 'to': u"orm['documents.Document']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'metadata_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['metadata.MetadataType']"}), + 'value': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + u'metadata.documenttypemetadatatype': { + 'Meta': {'unique_together': "(('document_type', 'metadata_type'),)", 'object_name': 'DocumentTypeMetadataType'}, + 'document_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['documents.DocumentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'metadata_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['metadata.MetadataType']"}), + 'required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + u'metadata.metadatatype': { + 'Meta': {'ordering': "('title',)", 'object_name': 'MetadataType'}, + 'default': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'lookup': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '48'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '48'}) + } + } + + complete_apps = ['metadata'] \ No newline at end of file