From 17f904c5c8f3195ffb7871c26aa48ee8715c174e Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Mon, 8 Oct 2018 21:29:08 +0200
Subject: [PATCH] Include children's publications in organization's ones
---
organizations/models.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/organizations/models.py b/organizations/models.py
index 07204100e..d6c211f23 100644
--- a/organizations/models.py
+++ b/organizations/models.py
@@ -88,10 +88,12 @@ class Organization(models.Model):
return reverse('organizations:organization_details', kwargs = {'pk': self.id})
def get_publications(self):
+ org_and_children_ids = [k['id'] for k in list(self.children.all().values('id'))]
+ org_and_children_ids += [self.id]
return Publication.objects.filter(
- models.Q(authors__affiliations__in=[self]) |
- models.Q(grants__funder__organization=self) |
- models.Q(funders_generic__organization=self)).distinct()
+ models.Q(authors__affiliations__pk__in=org_and_children_ids) |
+ models.Q(grants__funder__organization__pk__in=org_and_children_ids) |
+ models.Q(funders_generic__organization__pk__in=org_and_children_ids)).distinct()
def count_publications(self):
return self.get_publications().count()
--
GitLab