Addressed PR feedback

course_discovery/apps/course_metadata/migrations/0085_auto_20180706_0029.py → course_discovery/apps/course_metadata/migrations/0085_creditpathway.py

 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-07-06 00:29
+# Generated by Django 1.11.11 on 2018-07-06 14:21
 from __future__ import unicode_literals
 
+from django.db import migrations, models
 import django_extensions.db.fields
 import sortedm2m.fields
-from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
@@ -20,14 +20,15 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('created', django_extensions.db.fields.CreationDateTimeField(auto_now_add=True, verbose_name='created')),
                 ('modified', django_extensions.db.fields.ModificationDateTimeField(auto_now=True, verbose_name='modified')),
-                ('name', models.CharField(max_length=255)),
+                ('name', models.CharField(max_length=255, unique=True)),
                 ('org_name', models.CharField(max_length=255, verbose_name='Organization name')),
-                ('email', models.EmailField(max_length=255)),
+                ('email', models.EmailField(max_length=254)),
                 ('programs', sortedm2m.fields.SortedManyToManyField(help_text=None, to='course_metadata.Program')),
             ],
-        ),
-        migrations.AlterUniqueTogether(
-            name='creditpathway',
-            unique_together=set([('name', 'org_name')]),
+            options={
+                'get_latest_by': 'modified',
+                'abstract': False,
+                'ordering': ('-modified', '-created'),
+            },
         ),
     ]

course_discovery/apps/course_metadata/models.py

@@ -1276,16 +1276,15 @@ class Program(TimeStampedModel):
 
 class CreditPathway(TimeStampedModel):
     """ Credit Pathway model """
-    name = models.CharField(max_length=255)
+    name = models.CharField(max_length=255, unique=True)
+    # this field doesn't necessarily map to our normal org models, it's just a convenience field for pathways
+    # while we figure them out
     org_name = models.CharField(max_length=255, verbose_name=_("Organization name"))
-    email = models.EmailField(max_length=255)
+    email = models.EmailField()
     programs = SortedManyToManyField(Program)
 
     def __str__(self):
-        return "{org_name}: {name}".format(org_name=self.org_name, name=self.name)
-
-    class Meta(object):
-        unique_together = ('name', 'org_name')
+        return self.name
 
 
 class PersonSocialNetwork(AbstractSocialNetworkModel):

course_discovery/apps/course_metadata/tests/test_models.py

@@ -1115,8 +1115,7 @@ class CreditPathwayTests(TestCase):
 
     def test_str(self):
         credit_pathway = factories.CreditPathwayFactory()
-        self.assertEqual(str(credit_pathway),
-                         '{org_name}: {name}'.format(org_name=credit_pathway.org_name, name=credit_pathway.name))
+        self.assertEqual(str(credit_pathway), credit_pathway.name)
 
 
 class PersonSocialNetworkTests(TestCase):