Skip to content

Commit b796c25

Browse files
authored
[ENG-8177] Institution dashboard not showing user affiliations for Projects, Registrations and Preprints tabs (#11276)
* display only institution-specific user metrics reports * add missing exlude statement
1 parent a45770f commit b796c25

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

api/institutions/views.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -585,13 +585,17 @@ class _NewInstitutionUserMetricsList(InstitutionMixin, ElasticsearchListView):
585585
))
586586

587587
def get_default_search(self):
588-
_yearmonth = InstitutionalUserReport.most_recent_yearmonth()
589-
if _yearmonth is None:
588+
base_search = InstitutionalUserReport.search().filter(
589+
'term',
590+
institution_id=self.get_institution()._id,
591+
)
592+
yearmonth = InstitutionalUserReport.most_recent_yearmonth(base_search=base_search)
593+
if yearmonth is None:
590594
return None
595+
591596
return (
592-
InstitutionalUserReport.search()
593-
.filter('term', report_yearmonth=str(_yearmonth))
594-
.filter('term', institution_id=self.get_institution()._id)
597+
base_search
598+
.filter('term', report_yearmonth=str(yearmonth))
595599
.exclude('term', user_name='Deleted user')
596600
)
597601

0 commit comments

Comments
 (0)