From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 19 Aug 2016 17:21:41 +0000 (+0200)
Subject: Add period to project
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=f4d53b099d1126b6a904653fe5d3b07901345bef;p=mezzo.git

Add period to project
---

diff --git a/app/organization/project/admin.py b/app/organization/project/admin.py
index f0451cf6..89f9c40a 100644
--- a/app/organization/project/admin.py
+++ b/app/organization/project/admin.py
@@ -32,6 +32,7 @@ class ProjectAdminDisplayable(DisplayableAdmin):
 
     fieldsets = deepcopy(ProjectAdmin.fieldsets)
     inlines = [ProjectImageInline, ProjectBlockInline, ProjectLinkInline, ]
-
+    filter_horizontal = ['persons', 'teams', 'organizations']
+    
 
 admin.site.register(Project, ProjectAdminDisplayable)
diff --git a/app/organization/project/migrations/0007_auto_20160819_1920.py b/app/organization/project/migrations/0007_auto_20160819_1920.py
new file mode 100644
index 00000000..22cb41c3
--- /dev/null
+++ b/app/organization/project/migrations/0007_auto_20160819_1920.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-19 17:20
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organization-project', '0006_auto_20160818_1656'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='project',
+            name='date_begin',
+            field=models.DateField(blank=True, null=True, verbose_name='begin date'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='date_end',
+            field=models.DateField(blank=True, null=True, verbose_name='end date'),
+        ),
+    ]
diff --git a/app/organization/project/models.py b/app/organization/project/models.py
index 4cb42c8d..2922423b 100644
--- a/app/organization/project/models.py
+++ b/app/organization/project/models.py
@@ -9,7 +9,7 @@ from organization.core.models import *
 from organization.team.models import Person, Team, Organization
 
 
-class Project(Displayable, RichText):
+class Project(Displayable, Period, RichText):
     """(Project description)"""
 
     lead_team = models.ForeignKey(Team, verbose_name=_('lead team'), related_name='leader_projects', blank=True, null=True)
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 02dcb08d..85265dec 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 02dcb08dd9b735507ceec68a084fc07774a595d1
+Subproject commit 85265dec14e637e41a2f8adfc64b4b62a990ce95