From 5e8d69e9743d8508c573db1b25c2f7afaf6a8c6a Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sat, 6 Apr 2013 02:15:51 +0100 Subject: [PATCH] Fix null fields on address. --- ...ss_address2__chg_field_address_address3.py | 149 ++++++++++++++++++ app/stores/models/base.py | 4 +- 2 files changed, 151 insertions(+), 2 deletions(-) create mode 100644 app/stores/migrations/0007_auto__chg_field_address_address2__chg_field_address_address3.py diff --git a/app/stores/migrations/0007_auto__chg_field_address_address2__chg_field_address_address3.py b/app/stores/migrations/0007_auto__chg_field_address_address2__chg_field_address_address3.py new file mode 100644 index 0000000..838137f --- /dev/null +++ b/app/stores/migrations/0007_auto__chg_field_address_address2__chg_field_address_address3.py @@ -0,0 +1,149 @@ +# -*- coding: utf-8 -*- +import 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 'Address.address2' + db.alter_column(u'stores_address', 'address2', self.gf('django.db.models.fields.CharField')(max_length=200, null=True)) + + # Changing field 'Address.address3' + db.alter_column(u'stores_address', 'address3', self.gf('django.db.models.fields.CharField')(max_length=200, null=True)) + + def backwards(self, orm): + + # Changing field 'Address.address2' + db.alter_column(u'stores_address', 'address2', self.gf('django.db.models.fields.CharField')(default='', max_length=200)) + + # Changing field 'Address.address3' + db.alter_column(u'stores_address', 'address3', self.gf('django.db.models.fields.CharField')(default='', max_length=200)) + + 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', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 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', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + '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'}) + }, + 'stores.address': { + 'Meta': {'object_name': 'Address'}, + 'address1': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'address2': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'address3': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'city': ('django.db.models.fields.CharField', [], {'max_length': "'50'"}), + 'country': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'addresses'", 'to': "orm['stores.Country']"}), + 'county': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'addresses'", 'null': 'True', 'to': "orm['stores.County']"}), + 'geo_latitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'geo_longitude': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'postcode': ('django.db.models.fields.CharField', [], {'max_length': '20'}) + }, + 'stores.brand': { + 'Meta': {'ordering': "['name']", 'object_name': 'Brand'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) + }, + 'stores.chain': { + 'Meta': {'ordering': "['name']", 'object_name': 'Chain'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'editor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'editable_chains'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'head_office': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['stores.Address']", 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'long_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '200', 'blank': 'True'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) + }, + 'stores.claimrequest': { + 'Meta': {'object_name': 'ClaimRequest'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'note': ('django.db.models.fields.TextField', [], {}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'object_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'claims'", 'to': u"orm['auth.User']"}) + }, + 'stores.country': { + 'Meta': {'ordering': "['name']", 'object_name': 'Country'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'iso_code': ('django.db.models.fields.CharField', [], {'max_length': '3'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'stores.county': { + 'Meta': {'ordering': "['name']", 'object_name': 'County'}, + 'country': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'counties'", 'null': 'True', 'to': "orm['stores.Country']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'stores.link': { + 'Meta': {'object_name': 'Link'}, + 'account_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'account_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['stores.LinkType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'object_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}) + }, + 'stores.linktype': { + 'Meta': {'ordering': "['name']", 'object_name': 'LinkType'}, + 'icon': ('django.db.models.fields.CharField', [], {'default': "'icon-globe'", 'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'url_format': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'stores.store': { + 'Meta': {'ordering': "['name']", 'object_name': 'Store'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'address': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'stores'", 'to': "orm['stores.Address']"}), + 'brands': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['stores.Brand']", 'null': 'True', 'blank': 'True'}), + 'chain': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'stores'", 'null': 'True', 'to': "orm['stores.Chain']"}), + 'editor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'editable_stores'", 'null': 'True', 'to': u"orm['auth.User']"}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'long_description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '200', 'blank': 'True'}), + 'store_type': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'website': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['stores'] \ No newline at end of file diff --git a/app/stores/models/base.py b/app/stores/models/base.py index 323b477..874d2f2 100644 --- a/app/stores/models/base.py +++ b/app/stores/models/base.py @@ -147,8 +147,8 @@ class Address(models.Model): """ name = models.CharField('Address Name', max_length=200) address1 = models.CharField('Address Line 1', max_length=200, help_text="First line of the address. e.g. 1 Station Road") - address2 = models.CharField('Address Line 2', max_length=200, blank=True, help_text="(Optional) Second line of the address") - address3 = models.CharField('Address Line 3', max_length=200, blank=True, help_text="(Optional) Third line of the address") + address2 = models.CharField('Address Line 2', max_length=200, null=True, blank=True, help_text="(Optional) Second line of the address") + address3 = models.CharField('Address Line 3', max_length=200, null=True, blank=True, help_text="(Optional) Third line of the address") city = models.CharField('Town/City', max_length='50', help_text="City or town") county = models.ForeignKey('stores.County', related_name='addresses', null=True, blank=True, help_text="County or suburban area. (Ignore if the store is outside the UK)") country = models.ForeignKey('stores.Country', related_name='addresses')