diff options
author | Christian Pointner <equinox@helsinki.at> | 2017-01-12 17:28:03 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2017-01-12 17:28:03 (GMT) |
commit | 82204a17ee6feda5fcf4d376ef05bb9f4a8844c5 (patch) | |
tree | d6db4a53fb1b45af0a2420ba22388c401c28b10e /nop/migrations | |
parent | bee4dba4ed6c8519a9a87027d20d3c3f284ec7fa (diff) | |
parent | 1db5125c61ed8ed050b01b7d0944569727a39e48 (diff) |
Merge branch 'master' into stable
Diffstat (limited to 'nop/migrations')
-rw-r--r-- | nop/migrations/0001_initial.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nop/migrations/0001_initial.py b/nop/migrations/0001_initial.py index 67a04e8..0285517 100644 --- a/nop/migrations/0001_initial.py +++ b/nop/migrations/0001_initial.py @@ -2,6 +2,7 @@ from __future__ import unicode_literals from django.db import migrations, models +import nop.models class Migration(migrations.Migration): @@ -22,7 +23,7 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=765, blank=True)), ('artist', models.CharField(max_length=765, blank=True)), ('album', models.CharField(max_length=765, blank=True)), - ('ismusic', models.IntegerField(null=True, blank=True)), + ('carttype', nop.models.CartTypeField(max_length=64, blank=True)), ], options={ 'ordering': ['-timestamp'], @@ -39,7 +40,7 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=765, blank=True)), ('artist', models.CharField(max_length=765, blank=True)), ('album', models.CharField(max_length=765, blank=True)), - ('ismusic', models.IntegerField(null=True, blank=True)), + ('carttype', nop.models.CartTypeField(max_length=64, blank=True)), ], options={ 'ordering': ['-timestamp'], |