Add lead organization

diff --git a/app/organization/projects/migrations/0015_project_lead_organization.py b/app/organization/projects/migrations/0015_project_lead_organization.py
new file mode 100644 (file)
index 0000000..148a1fd
--- /dev/null
+++ b/app/organization/projects/migrations/0015_project_lead_organization.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-23 15:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-network', '0023_auto_20160921_2043'),
+        ('organization-projects', '0014_auto_20160922_1642'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='lead_organization',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='leader_projects', to='organization-network.Organization', verbose_name='lead organization'),
+        ),
+    ]

diff --git a/app/organization/projects/models.py b/app/organization/projects/models.py
index c5d1b63eefa452c07dd971dac6acbfedc4686e1e..abef3c3d4850dcb896467550467881207af9917e 100644 (file)
--- a/app/organization/projects/models.py
+++ b/app/organization/projects/models.py
@@ -22,6 +22,7 @@ class Project(Displayable, Period, RichText):
     program = models.ForeignKey('ProjectProgram', verbose_name=_('project program'), related_name='projects', blank=True, null=True, on_delete=models.SET_NULL)
     program_type = models.ForeignKey('ProjectProgramType', verbose_name=_('project program type'), related_name='projects', blank=True, null=True, on_delete=models.SET_NULL)
     lead_team = models.ForeignKey('organization-network.Team', verbose_name=_('lead team'), related_name='leader_projects', blank=True, null=True)
+    lead_organization = models.ForeignKey('organization-network.Organization', verbose_name=_('lead organization'), related_name='leader_projects', blank=True, null=True)
     teams = models.ManyToManyField('organization-network.Team', verbose_name=_('teams'), related_name='partner_projects', blank=True)
     organizations = models.ManyToManyField('organization-network.Organization', verbose_name=_('organizations'), blank=True)
     website = models.URLField(_('website'), max_length=512, blank=True)

diff --git a/app/templates/projects/project_detail.html b/app/templates/projects/project_detail.html
index e38e22e469cc0d57f34a1abde61caa1b1c0a5a3f..29fc4b2967565aab410cafbac930b9ad8a50bfa6 100644 (file)
--- a/app/templates/projects/project_detail.html
+++ b/app/templates/projects/project_detail.html
@@ -181,12 +181,21 @@
 
                                     {% if project.lead_team %}
                                         <div class="project-details__item">
+                                          {% if project.lead_team %}
                                             <div class="project-details__item-title">
                                                 {% trans "Project lead team" %}
                                             </div>
                                             <div class="project-details__item-desc">
                                                 {{ project.lead_team }}
                                             </div>
+                                          {% elif project.lead_organization %}
+                                            <div class="project-details__item-title">
+                                                {% trans "Project lead organization" %}
+                                            </div>
+                                            <div class="project-details__item-desc">
+                                                {{ project.lead_organization }}
+                                            </div>
+                                          {% endif %}
                                         </div>
                                     {% endif %}