From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 23 Mar 2017 07:17:18 +0000 (+0100)
Subject: Cleanup Person metadata
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=57a5df6440c3d74e57e7c9f81b56b196d24deade;p=mezzo.git

Cleanup Person metadata
---

diff --git a/app/organization/network/migrations/0094_auto_20170323_0815.py b/app/organization/network/migrations/0094_auto_20170323_0815.py
new file mode 100644
index 00000000..c1d3d908
--- /dev/null
+++ b/app/organization/network/migrations/0094_auto_20170323_0815.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-03-23 07:15
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0093_auto_20170322_1846'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='person',
+            name='organization_name',
+        ),
+        migrations.RemoveField(
+            model_name='person',
+            name='position',
+        ),
+    ]
diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index aaf27aa9..94f5a575 100644
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -215,8 +215,6 @@ class Person(Displayable, AdminThumbMixin, Address):
     bio = RichTextField(_('biography'), blank=True)
     role = models.CharField(_('role'), max_length=256, blank=True, null=True)
     external_id = models.CharField(_('external ID'), blank=True, null=True, max_length=128)
-    organization_name = models.CharField(_('organization name'), blank=True, null=True, max_length=128)
-    position = models.CharField(_('position'), blank=True, null=True, max_length=128)
 
     class Meta:
         verbose_name = _('person')
diff --git a/app/organization/projects/migrations/0054_auto_20170323_0815.py b/app/organization/projects/migrations/0054_auto_20170323_0815.py
new file mode 100644
index 00000000..de95c64e
--- /dev/null
+++ b/app/organization/projects/migrations/0054_auto_20170323_0815.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-03-23 07:15
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-projects', '0053_auto_20170314_1918'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='projectcontact',
+            name='organization_name',
+            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='organization name'),
+        ),
+        migrations.AddField(
+            model_name='projectcontact',
+            name='position',
+            field=models.CharField(blank=True, max_length=128, null=True, verbose_name='position'),
+        ),
+        migrations.AlterField(
+            model_name='projectpublicdata',
+            name='image_credits',
+            field=models.CharField(max_length=256, null=True, verbose_name='Image credits'),
+        ),
+    ]
diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py
index 7257e0ea..7be1b0a7 100644
--- a/app/organization/projects/models.py
+++ b/app/organization/projects/models.py
@@ -342,7 +342,7 @@ class ProjectPublicData(models.Model):
     resources_description = models.TextField(_('resource description'), help_text="Resources available to the artist -- e.g. office facility, studio facility, technical equipment, internet connection, laboratory, and periods of availability for artistic production, staff possibly allocated to the project, available budget for travel, consumables and equipment, etc... (50 – 100 words).")
     period = models.CharField(_('period of implementation'), max_length=128, help_text="Possible period of implementation (must be part of the project implementation workplan)")
     image = models.FileField(_("Image"), max_length=1024, upload_to="user/images/%Y/%m/%d/", help_text="Representing the project")
-    image_credits = models.CharField(_('Image credits'), max_length=256)
+    image_credits = models.CharField(_('Image credits'), max_length=256, null=True)
 
     class Meta:
         verbose_name = 'Project public data'
@@ -366,6 +366,8 @@ class ProjectPrivateData(models.Model):
 class ProjectContact(Person):
 
     project = models.ForeignKey(Project, verbose_name=_('project'), related_name='contacts', blank=True, null=True, on_delete=models.SET_NULL)
+    organization_name = models.CharField(_('organization name'), blank=True, null=True, max_length=128)
+    position = models.CharField(_('position'), blank=True, null=True, max_length=128)
 
     class Meta:
         verbose_name = 'Project contact'