From 90eed2c95bd78d1d8aa76ade1d65f14ef431bdf6 Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Wed, 23 Jul 2014 11:33:19 +0100 Subject: [PATCH] Made width and height focal point fields nullable --- .../wagtailimages/migrations/0003_focal_point_fields.py | 8 ++++---- wagtail/wagtailimages/models.py | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/wagtail/wagtailimages/migrations/0003_focal_point_fields.py b/wagtail/wagtailimages/migrations/0003_focal_point_fields.py index 3266b67eb7..c9b6be1f81 100644 --- a/wagtail/wagtailimages/migrations/0003_focal_point_fields.py +++ b/wagtail/wagtailimages/migrations/0003_focal_point_fields.py @@ -25,12 +25,12 @@ class Migration(SchemaMigration): # Adding field 'Image.focal_point_width' db.add_column('wagtailimages_image', 'focal_point_width', - self.gf('django.db.models.fields.PositiveIntegerField')(default=0), + self.gf('django.db.models.fields.PositiveIntegerField')(null=True), keep_default=False) # Adding field 'Image.focal_point_height' db.add_column('wagtailimages_image', 'focal_point_height', - self.gf('django.db.models.fields.PositiveIntegerField')(default=0), + self.gf('django.db.models.fields.PositiveIntegerField')(null=True), keep_default=False) # Adding field 'Rendition.focal_point_key' @@ -111,8 +111,8 @@ class Migration(SchemaMigration): 'Meta': {'object_name': 'Image'}, 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), 'file': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}), - 'focal_point_height': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), - 'focal_point_width': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}), + 'focal_point_height': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), + 'focal_point_width': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), 'focal_point_x': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), 'focal_point_y': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True'}), 'height': ('django.db.models.fields.IntegerField', [], {}), diff --git a/wagtail/wagtailimages/models.py b/wagtail/wagtailimages/models.py index 56fee89441..cb0dbd4612 100644 --- a/wagtail/wagtailimages/models.py +++ b/wagtail/wagtailimages/models.py @@ -53,8 +53,8 @@ class AbstractImage(models.Model, TagSearchable): focal_point_x = models.PositiveIntegerField(null=True, editable=False) focal_point_y = models.PositiveIntegerField(null=True, editable=False) - focal_point_width = models.PositiveIntegerField(default=0, editable=False) - focal_point_height = models.PositiveIntegerField(default=0, editable=False) + focal_point_width = models.PositiveIntegerField(null=True, editable=False) + focal_point_height = models.PositiveIntegerField(null=True, editable=False) search_fields = TagSearchable.search_fields + ( indexed.FilterField('uploaded_by_user'), @@ -65,7 +65,10 @@ class AbstractImage(models.Model, TagSearchable): @property def focal_point(self): - if self.focal_point_x is not None and self.focal_point_y is not None: + if self.focal_point_x is not None and \ + self.focal_point_y is not None and \ + self.focal_point_width is not None and \ + self.focal_point_height is not None: return FocalPoint( self.focal_point_x, self.focal_point_y,