Remove role field from Roles model.

* Update comicimporter & releated_creator template for the change. * Unable to remove dependency on multiselectfield since the initial migration depends on it. Ughh.
bpepple · Jan 20, 2018 · a91009c · a91009c
1 parent dfa5159
commit a91009c
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 22 deletions.
diff --git a/comics/migrations/0007_remove_roles_roles.py b/comics/migrations/0007_remove_roles_roles.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.0.1 on 2018-01-20 20:39
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comics', '0006_roles_migrate_data'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='roles',
+            name='roles',
+        ),
+    ]
diff --git a/comics/models.py b/comics/models.py
@@ -3,7 +3,6 @@
 
 from django.core.validators import RegexValidator
 from django.db import models
-from multiselectfield import MultiSelectField
 from solo.models import SingletonModel
 
 
@@ -16,21 +15,6 @@
     (2, 'Read'),
 )
 
-# Creator roles for an issue
-ROLE_CHOICES = (
-    ('artist', 'Artist'),
-    ('colorist', 'Colorist'),
-    ('cover', 'Cover'),
-    ('editor', 'Editor'),
-    ('inker', 'Inker'),
-    ('journalist', 'Journalist'),
-    ('letterer', 'Letterer'),
-    ('other', 'Other'),
-    ('penciler', 'Penciler'),
-    ('production', 'Production'),
-    ('writer', 'Writer'),
-)
-
 
 class Settings(SingletonModel):
     help_str = ('A 40-character key provided by ComicVine. '
@@ -246,7 +230,6 @@ def __str__(self):
 class Roles(models.Model):
     creator = models.ForeignKey(Creator, on_delete=models.CASCADE)
     issue = models.ForeignKey(Issue, on_delete=models.CASCADE)
-    roles = MultiSelectField(choices=ROLE_CHOICES)
     role = models.ManyToManyField(Role)
 
     def __str__(self):

diff --git a/comics/templates/comics/related_creators.html b/comics/templates/comics/related_creators.html
@@ -17,7 +17,12 @@ <h2>Creators</h2>
 					</div>
 				</a>
 				<a href="{% url 'creator:detail' roles.creator.slug %}"><p>{{ roles.creator.name }}</p></a>
-				<p><small><em>{{ roles.roles }}</em></small></p>
+				<p>
+				{% for r in roles.role.all %}
+				{% if not forloop.first %}, {% endif %}
+				    <small><em>{{ r.name }}</em></small>
+				{% endfor %}
+				</p>
 			</li>
 			{% endfor %}
 		</ul>

diff --git a/comics/utils/comicimporter.py b/comics/utils/comicimporter.py
@@ -16,7 +16,8 @@
 import requests_cache
 
 from comics.models import (Arc, Character, Creator, Issue,
-                           Publisher, Roles, Series, Team, Settings)
+                           Publisher, Role, Roles, Series,
+                           Team, Settings)
 
 from . import utils
 from .comicapi.comicarchive import MetaDataStyle, ComicArchive
@@ -588,9 +589,15 @@ def addComicFromMetadata(self, md):
                 creator_obj, c_create = Creator.objects.get_or_create(
                     cvid=p['id'],)
 
-                Roles.objects.create(creator=creator_obj,
-                                     issue=issue_obj,
-                                     roles=re.sub(' ', '', p['role']))
+                role_obj = Roles.objects.create(
+                    creator=creator_obj, issue=issue_obj)
+
+                roles = p['role'].split(',')
+                for role in roles:
+                    # Remove any whitespace
+                    role = role.strip()
+                    r, r_create = Role.objects.get_or_create(name=role.title())
+                    role_obj.role.add(r)
 
                 if c_create:
                     new_slug = orig = slugify(p['name'])