Go back to clean migration 0001

diff --git a/diggersdigest/records/admin.py b/diggersdigest/records/admin.py
index f476c371ec93de4f86424e553834236c860e8fe3..f902ec8216f54e95b8cc07eece0f7040f5386f6e 100644 (file)
--- a/diggersdigest/records/admin.py
+++ b/diggersdigest/records/admin.py
@@ -12,7 +12,7 @@ from .models import User
 from .models import Artist
 from .models import Label
 from .models import Country
-from .models import Record
+#from .models import Record
 from .models import Podcast
 
     
@@ -27,5 +27,5 @@ admin.site.register(User)
 admin.site.register(Artist)
 admin.site.register(Label)
 admin.site.register(Country)
-admin.site.register(Record)
+#admin.site.register(Record)
 admin.site.register(Podcast)

diff --git a/diggersdigest/records/migrations/0001_initial.py b/diggersdigest/records/migrations/0001_initial.py
index 108129c5496e8f30e7c91a5dc3639b39baab394f..f2aee29e8b4944c27b67b2b49c832a5ad28622c3 100644 (file)
--- a/diggersdigest/records/migrations/0001_initial.py
+++ b/diggersdigest/records/migrations/0001_initial.py
@@ -2,11 +2,13 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+import mezzanine.core.fields
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('blog', '0002_auto_20150527_1555'),
     ]
 
     operations = [
@@ -147,4 +149,36 @@ class Migration(migrations.Migration):
                 'managed': False,
             },
         ),
+        migrations.CreateModel(
+            name='Artist',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=128)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Country',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=128)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Label',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=128)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Podcast',
+            fields=[
+                ('blogpost_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='blog.BlogPost')),
+                ('audio', mezzanine.core.fields.FileField(max_length=200, verbose_name='Audio File')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('blog.blogpost',),
+        ),
     ]

diff --git a/diggersdigest/records/migrations/0002_artist_country_label_record.py b/diggersdigest/records/migrations/0002_artist_country_label_record.py
deleted file mode 100644 (file)
index fa32ff4..0000000
--- a/diggersdigest/records/migrations/0002_artist_country_label_record.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('shop', '0005_auto_20150527_1127'),
-        ('records', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Artist',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Country',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Label',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('name', models.CharField(max_length=128)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Record',
-            fields=[
-                ('product_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='shop.Product')),
-                ('artiste', models.CharField(max_length=128)),
-                ('new', models.IntegerField()),
-                ('label', models.CharField(max_length=128)),
-                ('date', models.CharField(max_length=8)),
-                ('pays', models.CharField(max_length=128)),
-                ('desc', models.TextField()),
-                ('cover', models.IntegerField()),
-                ('vinyl', models.IntegerField()),
-                ('audio', mezzanine.core.fields.FileField(max_length=200, verbose_name='Audio File')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=('shop.product',),
-        ),
-    ]

diff --git a/diggersdigest/records/migrations/0003_podcast.py b/diggersdigest/records/migrations/0003_podcast.py
deleted file mode 100644 (file)
index 3530232..0000000
--- a/diggersdigest/records/migrations/0003_podcast.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('blog', '0002_auto_20150527_1555'),
-        ('records', '0002_artist_country_label_record'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Podcast',
-            fields=[
-                ('blogpost_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='blog.BlogPost')),
-                ('audio', mezzanine.core.fields.FileField(max_length=200, verbose_name='Audio File')),
-            ],
-            options={
-                'abstract': False,
-            },
-            bases=('blog.blogpost',),
-        ),
-    ]

diff --git a/diggersdigest/records/migrations/0004_auto_20150824_1537.py b/diggersdigest/records/migrations/0004_auto_20150824_1537.py
deleted file mode 100644 (file)
index b5f9a63..0000000
--- a/diggersdigest/records/migrations/0004_auto_20150824_1537.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('records', '0003_podcast'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='record',
-            name='artiste',
-            field=models.ForeignKey(to='records.Artist'),
-        ),
-        migrations.AlterField(
-            model_name='record',
-            name='label',
-            field=models.ForeignKey(to='records.Label'),
-        ),
-        migrations.AlterField(
-            model_name='record',
-            name='pays',
-            field=models.ForeignKey(to='records.Country'),
-        ),
-    ]

diff --git a/diggersdigest/records/migrations/0005_auto_20150824_1547.py b/diggersdigest/records/migrations/0005_auto_20150824_1547.py
deleted file mode 100644 (file)
index f7dd0ca..0000000
--- a/diggersdigest/records/migrations/0005_auto_20150824_1547.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('records', '0004_auto_20150824_1537'),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name='record',
-            old_name='artiste',
-            new_name='artist',
-        ),
-        migrations.RenameField(
-            model_name='record',
-            old_name='pays',
-            new_name='country',
-        ),
-    ]

diff --git a/diggersdigest/records/migrations/0006_auto_20150825_1452.py b/diggersdigest/records/migrations/0006_auto_20150825_1452.py
deleted file mode 100644 (file)
index 547f70d..0000000
--- a/diggersdigest/records/migrations/0006_auto_20150825_1452.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('records', '0005_auto_20150824_1547'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='record',
-            name='new',
-            field=models.IntegerField(default=1, choices=[(0, ''), (1, 'New'), (2, 'On Hold'), (3, 'Just Sold')]),
-        ),
-    ]

diff --git a/diggersdigest/records/migrations/0007_auto_20150825_1511.py b/diggersdigest/records/migrations/0007_auto_20150825_1511.py
deleted file mode 100644 (file)
index 88b9d2c..0000000
--- a/diggersdigest/records/migrations/0007_auto_20150825_1511.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('records', '0006_auto_20150825_1452'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='record',
-            name='date',
-            field=models.DateField(),
-        ),
-    ]

diff --git a/diggersdigest/records/migrations/0008_auto_20150825_1544.py b/diggersdigest/records/migrations/0008_auto_20150825_1544.py
deleted file mode 100644 (file)
index 4b2f974..0000000
--- a/diggersdigest/records/migrations/0008_auto_20150825_1544.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-import django.db.models.deletion
-import mezzanine.core.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('records', '0007_auto_20150825_1511'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='record',
-            name='audio',
-        ),
-        migrations.RemoveField(
-            model_name='record',
-            name='cover',
-        ),
-        migrations.RemoveField(
-            model_name='record',
-            name='date',
-        ),
-        migrations.RemoveField(
-            model_name='record',
-            name='desc',
-        ),
-        migrations.RemoveField(
-            model_name='record',
-            name='new',
-        ),
-        migrations.RemoveField(
-            model_name='record',
-            name='vinyl',
-        ),
-        migrations.AddField(
-            model_name='record',
-            name='audio_file',
-            field=mezzanine.core.fields.FileField(max_length=1024, null=True, verbose_name='Audio File'),
-        ),
-        migrations.AddField(
-            model_name='record',
-            name='cover_state',
-            field=models.ForeignKey(related_name='records_cover_states', on_delete=django.db.models.deletion.SET_NULL, to_field='cover state', to='records.Grading', null=True),
-        ),
-        migrations.AddField(
-            model_name='record',
-            name='performers',
-            field=models.ManyToManyField(db_constraint='performer', to='records.Artist', related_name='records_performers'),
-        ),
-        migrations.AddField(
-            model_name='record',
-            name='record_status',
-            field=models.IntegerField(default=1, verbose_name='record status', choices=[(0, ''), (1, 'New'), (2, 'On Hold'), (3, 'Just Sold')]),
-        ),
-        migrations.AddField(
-            model_name='record',
-            name='release_date',
-            field=models.DateField(null=True, verbose_name='release date'),
-        ),
-        migrations.AddField(
-            model_name='record',
-            name='vinyl_state',
-            field=models.ForeignKey(related_name='records_vinyl_states', on_delete=django.db.models.deletion.SET_NULL, to_field='vinyl state', to='records.Grading', null=True),
-        ),
-        migrations.AlterField(
-            model_name='record',
-            name='artist',
-            field=models.ForeignKey(related_name='records_artists', on_delete=django.db.models.deletion.SET_NULL, to_field='artist', to='records.Artist', null=True),
-        ),
-        migrations.AlterField(
-            model_name='record',
-            name='country',
-            field=models.ForeignKey(related_name='records', on_delete=django.db.models.deletion.SET_NULL, to_field='country', to='records.Country', null=True),
-        ),
-        migrations.AlterField(
-            model_name='record',
-            name='label',
-            field=models.ForeignKey(related_name='records', on_delete=django.db.models.deletion.SET_NULL, to_field='label', to='records.Label', null=True),
-        ),
-        migrations.AlterModelTable(
-            name='record',
-            table='records',
-        ),
-    ]

diff --git a/diggersdigest/records/models.py b/diggersdigest/records/models.py
index 223b8c02891beba3630c15ad7bdeb142fbc8eb54..b306aa59016b755b712653d53408fd3aa78801cf 100644 (file)
--- a/diggersdigest/records/models.py
+++ b/diggersdigest/records/models.py
@@ -174,43 +174,39 @@ class Country(models.Model):
         return self.name
 
 
-
-class Record(Product):
-    """
-    Model for Record
-    """
-    # herited fields (from Product):
-    # title --> shop.titre
-    # categories --> shop.theme
-    # price --> shop.prix
-    # status --> shop.published
-    NEW = 1
-    ON_HOLD = 2
-    JUST_SOLD = 3
-    NOVELTY_CHOICES = (
-        (0, ''),
-        (NEW, 'New'),
-        (ON_HOLD, 'On Hold'),
-        (JUST_SOLD, 'Just Sold')
-    )
-    #GRADINGS_CHOICES = ()
-
-    artist = models.ForeignKey(Artist, _('artist'), related_name='records_artists', null=True, on_delete=models.SET_NULL)
-    performers = models.ManyToManyField(Artist, _('performer'), related_name='records_performers')
-    record_status = models.IntegerField(_('record status'), choices=NOVELTY_CHOICES, default=NEW)
-    label = models.ForeignKey(Label, _('label'), related_name='records', null=True, on_delete=models.SET_NULL)
-    release_date = models.DateField(_('release date'), null=True)
-    country = models.ForeignKey(Country, _('country'), related_name='records', null=True, on_delete=models.SET_NULL)
-    cover_state = models.ForeignKey(Grading, _('cover state'), related_name='records_cover_states', null=True, on_delete=models.SET_NULL)
-    vinyl_state = models.ForeignKey(Grading, _('vinyl state'), related_name='records_vinyl_states', null=True, on_delete=models.SET_NULL)
-    audio_file =  FileField(_("Audio File"), max_length=1024, format="audio",
-                        upload_to=upload_to("records.Record.audio", "audio/records"), null=True)
-
-    def __unicode__(self):
-        return " - ".join([self.artist, self.title])
-
-    class Meta:
-        db_table = 'records'
+## class Record(Product):
+##     """
+##     Model for Record
+##     """
+##     # herited fields (from Product):
+##     # title --> shop.titre
+##     # categories --> shop.theme
+##     # price --> shop.prix
+##     # status --> shop.published
+##     NEW = 1
+##     ON_HOLD = 2
+##     JUST_SOLD = 3
+##     NOVELTY_CHOICES = (
+##         (0, ''),
+##         (NEW, 'New'),
+##         (ON_HOLD, 'On Hold'),
+##         (JUST_SOLD, 'Just Sold')
+##     )
+##     #GRADINGS_CHOICES = ()
+
+##     artist = models.ForeignKey(Artist, _('artist'), related_name='records_artists', null=True, on_delete=models.SET_NULL)
+##     performers = models.ManyToManyField(Artist, _('performer'), related_name='records_performers')
+##     record_status = models.IntegerField(_('record status'), choices=NOVELTY_CHOICES, default=NEW)
+##     label = models.ForeignKey(Label, _('label'), related_name='records', null=True, on_delete=models.SET_NULL)
+##     release_date = models.DateField(_('release date'), null=True)
+##     country = models.ForeignKey(Country, _('country'), related_name='records', null=True, on_delete=models.SET_NULL)
+##     cover_state = models.ForeignKey(Grading, _('cover state'), related_name='records_cover_states', null=True, on_delete=models.SET_NULL)
+##     vinyl_state = models.ForeignKey(Grading, _('vinyl state'), related_name='records_vinyl_states', null=True, on_delete=models.SET_NULL)
+##     audio_file =  FileField(_("Audio File"), max_length=1024, format="audio",
+##                         upload_to=upload_to("records.Record.audio", "audio/records"), null=True)
+
+##     def __unicode__(self):
+##         return " - ".join([self.artist, self.title])
 
 class Podcast(BlogPost):
     audio =  FileField(verbose_name=_("Audio File"), max_length=200, format="audio",