Merge pull request #56 from edx/clintonb/index-fix

Corrected index declaration and squashed migrations

course_discovery/apps/course_metadata/migrations/0002_auto_20160404_1626.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('course_metadata', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='expectedlearningitem',
-            options={},
-        ),
-        migrations.AlterModelOptions(
-            name='syllabusitem',
-            options={},
-        ),
-    ]

course_discovery/apps/course_metadata/migrations/0003_auto_20160404_1734.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('course_metadata', '0002_auto_20160404_1626'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='courserun',
-            name='course',
-            field=models.ForeignKey(related_name='course_runs', to='course_metadata.Course'),
-        ),
-        migrations.AlterField(
-            model_name='historicalseat',
-            name='credit_hours',
-            field=models.IntegerField(null=True, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalseat',
-            name='credit_provider',
-            field=models.CharField(max_length=255, null=True, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='historicalseat',
-            name='price',
-            field=models.DecimalField(decimal_places=2, default=0.0, max_digits=10),
-        ),
-        migrations.AlterField(
-            model_name='historicalseat',
-            name='upgrade_deadline',
-            field=models.DateTimeField(null=True, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='seat',
-            name='credit_hours',
-            field=models.IntegerField(null=True, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='seat',
-            name='credit_provider',
-            field=models.CharField(max_length=255, null=True, blank=True),
-        ),
-        migrations.AlterField(
-            model_name='seat',
-            name='price',
-            field=models.DecimalField(decimal_places=2, default=0.0, max_digits=10),
-        ),
-        migrations.AlterField(
-            model_name='seat',
-            name='upgrade_deadline',
-            field=models.DateTimeField(null=True, blank=True),
-        ),
-    ]

course_discovery/apps/course_metadata/migrations/0004_auto_20160404_1944.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('course_metadata', '0003_auto_20160404_1734'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='video',
-            name='image',
-            field=models.ForeignKey(to='course_metadata.Image', null=True, blank=True),
-        ),
-    ]

course_discovery/apps/course_metadata/models.py

@@ -282,5 +282,5 @@ class CourseOrganization(TimeStampedModel):
             ('course', 'relation_type'),
         )
         unique_together = (
-            ('course', 'relation_type', 'relation_type'),
+            ('course', 'organization', 'relation_type'),
         )