Added and updated migrations.

 - Legacy-Id: 11286

Author: levkowetz

ietf/person/migrations/0011_populate_photos.py

@@ -9,9 +9,12 @@
 from django.conf import settings
 from django.utils.text import slugify
 
+from ietf.person.name import name_parts
+
 def photo_name(person,thumb=False):
     hasher = Hashids(salt='Person photo name salt',min_length=5)
-    return '%s-%s%s' % ( slugify(person.ascii), hasher.encode(person.id), '-th' if thumb else '' )
+    _, first, _, last, _ = name_parts(person.ascii)
+    return '%s-%s%s' % ( slugify("%s %s" % (first, last)), hasher.encode(person.id), '-th' if thumb else '' )
 
 def forward(apps,schema_editor):
     Person = apps.get_model('person','Person')
@@ -22,6 +25,8 @@ def forward(apps,schema_editor):
         break # Only interested in the files in the top directory
     image_basenames = [os.path.splitext(name)[0] for name in image_filenames]
     for person in Person.objects.all():
+        if not person.name.strip():
+            continue
         dirty = False
         if photo_name(person,thumb=False) in image_basenames:
             person.photo = os.path.join(settings.PHOTOS_DIRNAME, image_filenames[image_basenames.index(photo_name(person,thumb=False))])

ietf/person/migrations/0012_auto_20160606_0823.py

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import ietf.utils.storage
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('person', '0011_populate_photos'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='person',
+            name='biography',
+            field=models.TextField(help_text=b'Short biography for use on leadership pages. Use plain text or reStructuredText markup.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='person',
+            name='photo',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='person',
+            name='photo_thumb',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='personhistory',
+            name='biography',
+            field=models.TextField(help_text=b'Short biography for use on leadership pages. Use plain text or reStructuredText markup.', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='personhistory',
+            name='photo',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='personhistory',
+            name='photo_thumb',
+            field=models.ImageField(storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=b'photos', blank=True),
+            preserve_default=True,
+        ),
+    ]