From 351175847f12893338dcfc71f36239d4e7dbabb9 Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 3 Apr 2012 11:01:04 +0200 Subject: [PATCH] fix default value for duration field with Django 1.4 + MySQL --- telemeta/migrations/0001_initial.py | 10 +++++----- telemeta/models/core.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/telemeta/migrations/0001_initial.py b/telemeta/migrations/0001_initial.py index 90d0d8de..2cb10776 100644 --- a/telemeta/migrations/0001_initial.py +++ b/telemeta/migrations/0001_initial.py @@ -294,7 +294,7 @@ class Migration(SchemaMigration): ('conservation_site', self.gf('telemeta.models.core.CharField')(default='', max_length=250, blank=True)), ('code', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)), ('old_code', self.gf('telemeta.models.core.CharField')(default=None, max_length=250, null=True, blank=True)), - ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='00:00', blank=True)), + ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='0', blank=True)), ('physical_items_num', self.gf('telemeta.models.core.IntegerField')(default=0, blank=True)), ('physical_format', self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='collections', null=True, blank=True, to=orm['telemeta.PhysicalFormat'])), ('ad_conversion', self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='collections', null=True, blank=True, to=orm['telemeta.AdConversion'])), @@ -348,7 +348,7 @@ class Migration(SchemaMigration): ('copied_from_item', self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='copies', null=True, blank=True, to=orm['telemeta.MediaItem'])), ('public_access', self.gf('telemeta.models.core.CharField')(default='metadata', max_length=16, blank=True)), ('file', self.gf('telemeta.models.core.FileField')(default='', max_length=100, db_column='filename', blank=True)), - ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='00:00', blank=True)), + ('approx_duration', self.gf('telemeta.models.core.DurationField')(default='0', blank=True)), )) db.send_create_signal('telemeta', ['MediaItem']) @@ -752,7 +752,7 @@ class Migration(SchemaMigration): 'ad_conversion': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.AdConversion']"}), 'alt_ids': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), - 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'00:00'", 'blank': 'True'}), + 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), 'booklet_author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 'booklet_description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), 'cnrs_contributor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), @@ -817,7 +817,7 @@ class Migration(SchemaMigration): 'telemeta.mediaitem': { 'Meta': {'object_name': 'MediaItem', 'db_table': "'media_items'"}, 'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), - 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'00:00'", 'blank': 'True'}), + 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), 'author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), 'code': ('telemeta.models.core.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '250', 'blank': 'True'}), 'collection': ('telemeta.models.core.ForeignKey', [], {'related_name': "'items'", 'to': "orm['telemeta.MediaCollection']"}), @@ -995,4 +995,4 @@ class Migration(SchemaMigration): } } - complete_apps = ['telemeta'] \ No newline at end of file + complete_apps = ['telemeta'] diff --git a/telemeta/models/core.py b/telemeta/models/core.py index e5a2078e..ce88c86e 100644 --- a/telemeta/models/core.py +++ b/telemeta/models/core.py @@ -151,7 +151,7 @@ class DurationField(models.Field): } def __init__(self, *args, **kwargs): - super(DurationField, self).__init__(*args, **normalize_field(kwargs, '00:00')) + super(DurationField, self).__init__(*args, **normalize_field(kwargs, '0')) def db_type(self): return 'int' -- 2.39.5