Fix migrations

diff --git a/diggersdigest/records/admin.py b/diggersdigest/records/admin.py
index f902ec8216f54e95b8cc07eece0f7040f5386f6e..f476c371ec93de4f86424e553834236c860e8fe3 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 f2aee29e8b4944c27b67b2b49c832a5ad28622c3..108129c5496e8f30e7c91a5dc3639b39baab394f 100644 (file)
--- a/diggersdigest/records/migrations/0001_initial.py
+++ b/diggersdigest/records/migrations/0001_initial.py
@@ -2,13 +2,11 @@
 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 = [
@@ -149,36 +147,4 @@ 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_podcast_record.py b/diggersdigest/records/migrations/0002_artist_country_label_podcast_record.py
new file mode 100644 (file)
index 0000000..5de0e20
--- /dev/null
+++ b/diggersdigest/records/migrations/0002_artist_country_label_podcast_record.py
@@ -0,0 +1,65 @@
+# -*- 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 = [
+        ('blog', '0002_auto_20150527_1555'),
+        ('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='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',),
+        ),
+        migrations.CreateModel(
+            name='Record',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('title', models.CharField(max_length=128)),
+                ('record_status', models.IntegerField(default=1, verbose_name='record status', choices=[(0, ''), (1, 'New'), (2, 'On Hold'), (3, 'Just Sold')])),
+                ('release_date', models.DateField(null=True, verbose_name='release date')),
+                ('audio_file', mezzanine.core.fields.FileField(max_length=1024, null=True, verbose_name='audio file')),
+                ('artist', models.ForeignKey(related_name='records_artists', on_delete=django.db.models.deletion.SET_NULL, verbose_name='artist', to='records.Artist', null=True)),
+                ('country', models.ForeignKey(related_name='records', on_delete=django.db.models.deletion.SET_NULL, verbose_name='country', to='records.Country', null=True)),
+                ('cover_state', models.ForeignKey(related_name='records_cover_states', on_delete=django.db.models.deletion.SET_NULL, verbose_name='cover state', to='records.Grading', null=True)),
+                ('label', models.ForeignKey(related_name='records', on_delete=django.db.models.deletion.SET_NULL, verbose_name='label', to='records.Label', null=True)),
+                ('performers', models.ManyToManyField(related_name='records_performers', verbose_name='performer', to='records.Artist')),
+                ('vinyl_state', models.ForeignKey(related_name='records_vinyl_states', on_delete=django.db.models.deletion.SET_NULL, verbose_name='vinyl state', to='records.Grading', null=True)),
+            ],
+        ),
+    ]

diff --git a/diggersdigest/records/models.py b/diggersdigest/records/models.py
index b306aa59016b755b712653d53408fd3aa78801cf..d6065d6e4f4a3ccb1ff83072b95635563d3af83a 100644 (file)
--- a/diggersdigest/records/models.py
+++ b/diggersdigest/records/models.py
@@ -174,39 +174,38 @@ class Country(models.Model):
         return self.name
 
 
-## class Record(Product):
-##     """
-##     Model for Record
-##     """
+class Record(models.Model):
+    """
+    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])
+    NEW = 1
+    ON_HOLD = 2
+    JUST_SOLD = 3
+    NOVELTY_CHOICES = (
+        (0, ''),
+        (NEW, 'New'),
+        (ON_HOLD, 'On Hold'),
+        (JUST_SOLD, 'Just Sold')
+    )
+    title = models.CharField(max_length=128) 
+    artist = models.ForeignKey(Artist, verbose_name=_('artist'), related_name='records_artists', null=True, on_delete=models.SET_NULL)
+    performers = models.ManyToManyField(Artist, verbose_name=_('performer'), related_name='records_performers')
+    record_status = models.IntegerField(_('record status'), choices=NOVELTY_CHOICES, default=NEW)
+    label = models.ForeignKey(Label, verbose_name=_('label'), related_name='records', null=True, on_delete=models.SET_NULL)
+    release_date = models.DateField(_('release date'), null=True)
+    country = models.ForeignKey(Country, verbose_name=_('country'), related_name='records', null=True, on_delete=models.SET_NULL)
+    cover_state = models.ForeignKey(Grading, verbose_name=_('cover state'), related_name='records_cover_states', null=True, on_delete=models.SET_NULL)
+    vinyl_state = models.ForeignKey(Grading, verbose_name=_('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",