From 84e6c5bbd798ae7dd4715ed0c05bb3b5ff629bc6 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 7 Nov 2016 15:26:27 +0100
Subject: [PATCH] Fix person save

---
 .../commands/import-ircam-person-xls.py       |  3 ++-
 .../migrations/0053_auto_20161107_1214.py     | 20 +++++++++++++++++++
 app/organization/network/models.py            | 16 +++++++--------
 3 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 app/organization/network/migrations/0053_auto_20161107_1214.py

diff --git a/app/organization/network/management/commands/import-ircam-person-xls.py b/app/organization/network/management/commands/import-ircam-person-xls.py
index 686740d6..e51a0a87 100644
--- a/app/organization/network/management/commands/import-ircam-person-xls.py
+++ b/app/organization/network/management/commands/import-ircam-person-xls.py
@@ -115,7 +115,8 @@ class IrcamPerson(object):
             last_name = ' '.join(last_name)
 
             title = ' '.join((first_name, last_name))
-            person, c = Person.objects.get_or_create(title=title)
+            print('----'  + title)
+            person, c = Person.objects.get_or_create(title=title, first_name=first_name, last_name=last_name)
 
             return person
         return None
diff --git a/app/organization/network/migrations/0053_auto_20161107_1214.py b/app/organization/network/migrations/0053_auto_20161107_1214.py
new file mode 100644
index 00000000..6893c21e
--- /dev/null
+++ b/app/organization/network/migrations/0053_auto_20161107_1214.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.10 on 2016-11-07 11:14
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0052_auto_20161106_2239'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='activitystatus',
+            name='display',
+            field=models.BooleanField(default=True, verbose_name='display on team page'),
+        ),
+    ]
diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index a501976a..689248f9 100644
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -228,7 +228,7 @@ class Person(Displayable, AdminThumbMixin):
         ordering = ['last_name',]
 
     def __str__(self):
-        return ' '.join((self.last_name, self.first_name))
+        return self.title
 
     def get_absolute_url(self):
         return reverse("organization-network-person-detail", kwargs={'slug': self.slug})
@@ -245,13 +245,13 @@ class Person(Displayable, AdminThumbMixin):
             self.first_name = names[0]
             self.last_name = ' '.join(names[1:])
 
-    def clean(self):
-        super(Person, self).clean()
-        self.set_names()
-
-    def save(self, *args, **kwargs):
-        self.set_names()
-        super(Person, self).save(*args, **kwargs)
+    # def clean(self):
+    #     super(Person, self).clean()
+    #     self.set_names()
+    #
+    # def save(self, *args, **kwargs):
+    #     self.set_names()
+    #     super(Person, self).save(*args, **kwargs)
 
 
 class PersonPlaylist(PlaylistRelated):
-- 
2.39.5