Status diplayed by default, published projects only

diff --git a/app/organization/network/management/commands/import-ircam-person-xls.py b/app/organization/network/management/commands/import-ircam-person-xls.py
index 054768646e93dd0f881dade2462d55badaf235ea..686740d6af32c5bdc451fb8859450dcab717b31f 100644 (file)
--- a/app/organization/network/management/commands/import-ircam-person-xls.py
+++ b/app/organization/network/management/commands/import-ircam-person-xls.py
@@ -154,6 +154,7 @@ class IrcamPerson(object):
                 elif type == 'title':
                     qs = Q(title=value) | Q(title=value.lower()) | Q(title=value.upper()) | Q(title=value.capitalize())
                     obj = model(title=value)
+                    obj.status = 1
                 elif type == 'person':
                     obj = self.get_person(value)
                     qs = None

diff --git a/app/organization/network/models.py b/app/organization/network/models.py
index 647b95f3420a2ff6d158de9f85eb80d5b34486c0..a501976a0a5c0e179f0bd02b967b593104e71b0e 100644 (file)
--- a/app/organization/network/models.py
+++ b/app/organization/network/models.py
@@ -314,7 +314,7 @@ class PersonListBlockInline(models.Model):
 class ActivityStatus(Named):
 
     order = models.IntegerField(_('order number'), default=100)
-    display = models.BooleanField(_('display on team page'), blank=True, default=False)
+    display = models.BooleanField(_('display on team page'), blank=True, default=True)
 
     class Meta:
         verbose_name = _('activity status')

diff --git a/app/organization/projects/admin.py b/app/organization/projects/admin.py
index daed65c2e91ef1304004483592435ae3376ef6ff..12c73238d8ea7d3d8dc44c4fe472a1928804de67 100644 (file)
--- a/app/organization/projects/admin.py
+++ b/app/organization/projects/admin.py
@@ -82,6 +82,7 @@ class ProjectAdminDisplayable(DisplayableAdmin):
                 DynamicContentProjectInline]
     filter_horizontal = ['teams', 'organizations']
     list_filter = ['type', 'program', 'program_type', ]
+    list_display = ['title', 'date_from', 'date_to', 'status', 'admin_link']
 
 
 class ProjectTopicAdmin(BaseTranslationModelAdmin):

diff --git a/app/templates/pages/teampage.html b/app/templates/pages/teampage.html
index 39bdfcab88fe94976bb5aaf67a1058841d7e7e19..c4c98ef0892b6ca19e6f0095f9c8774c4d9821d4 100644 (file)
--- a/app/templates/pages/teampage.html
+++ b/app/templates/pages/teampage.html
@@ -96,11 +96,11 @@
 
 
 {% block related_project %}
-    {% if page.teampage.team.leader_projects.all or page.teampage.team.partner_projects.all %}
+    {% if page.teampage.team.leader_projects.published or page.teampage.team.partner_projects.published %}
         <div class="white-bg pb2">
             <hr class="mt0" />
             <div class="container">
-                {% with page.teampage.team.partner_projects.all|get_type:"internal" as projects %}
+                {% with page.teampage.team.partner_projects.published|get_type:"internal" as projects %}
                     {% if projects %}
                         <div class="row">
                             <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg" data-summary-content>
@@ -110,8 +110,8 @@
                         </div>
                     {% endif %}
                 {% endwith %}
-                {% with page.teampage.team.leader_projects.all|get_type:"external" as leader_projects %}
-                {% with page.teampage.team.partner_projects.all|get_type:"external" as partner_projects %}
+                {% with page.teampage.team.leader_projects.published|get_type:"external" as leader_projects %}
+                {% with page.teampage.team.partner_projects.published|get_type:"external" as partner_projects %}
                 {% if leader_projects or partner_projects %}
                 <div class="row">
                     <div class="col-sm-9 col-sm-push-3 col-lg-8 col-lg-push-2 white-bg" data-summary-content>