From: Guillaume Pellerin Date: Fri, 23 Sep 2016 16:01:50 +0000 (+0200) Subject: Add lead organization X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e22f70197da4f41abf01ad72ba8890bb65435e40;p=mezzo.git 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 index 00000000..148a1fde --- /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 c5d1b63e..abef3c3d 100644 --- 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 e38e22e4..29fc4b29 100644 --- a/app/templates/projects/project_detail.html +++ b/app/templates/projects/project_detail.html @@ -181,12 +181,21 @@ {% if project.lead_team %}
+ {% if project.lead_team %}
{% trans "Project lead team" %}
{{ project.lead_team }}
+ {% elif project.lead_organization %} +
+ {% trans "Project lead organization" %} +
+
+ {{ project.lead_organization }} +
+ {% endif %}
{% endif %}