From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 18 Oct 2016 10:30:58 +0000 (+0200)
Subject: Bump postgres to 9.5, add admin person desc
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9cbe7ebc37037a6155044e4b469fd3bbd8b622a6;p=mezzo.git

Bump postgres to 9.5, add admin person desc
---

diff --git a/app/organization/network/admin.py b/app/organization/network/admin.py
index a26421d7..4a04fc19 100644
--- a/app/organization/network/admin.py
+++ b/app/organization/network/admin.py
@@ -110,7 +110,7 @@ class PersonAdmin(BaseTranslationOrderedModelAdmin):
                PersonFileInline ]
     first_fields = ['last_name', 'first_name', 'title', 'gender', 'user']
     search_fields = ['last_name', 'first_name']
-    list_display = ['last_name', 'first_name', 'email', 'gender']
+    list_display = ['last_name', 'first_name', 'description', 'email', 'gender']
     list_filter = ['person_title', 'activities__date_from', 'activities__date_to', 'activities__is_permanent', 'activities__framework', 'activities__grade', 'activities__function', 'activities__team', 'activities__project',]
 
 
diff --git a/docker-compose.yml b/docker-compose.yml
index c7f27712..48e79f24 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,7 +29,7 @@ data:
   command: "true"
 
 db:
-  image: postgres
+  image: postgres:9.5
   volumes_from:
     - data
   volumes: