Skip to content

[ENG-8177] Institution dashboard not showing user affiliations for Projects, Registrations and Preprints tabs #11276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: feature/pbs-25-19
Choose a base branch
from
Open

[ENG-8177] Institution dashboard not showing user affiliations for Projects, Registrations and Preprints tabs #11276

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e06fcca
display only institution-specific user metrics reports
antkryt Sep 2, 2025
2f0318f
add missing exlude statement
antkryt Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions api/institutions/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,13 +585,17 @@ class _NewInstitutionUserMetricsList(InstitutionMixin, ElasticsearchListView):
))

def get_default_search(self):
_yearmonth = InstitutionalUserReport.most_recent_yearmonth()
if _yearmonth is None:
base_search = InstitutionalUserReport.search().filter(
'term',
institution_id=self.get_institution()._id,
)
yearmonth = InstitutionalUserReport.most_recent_yearmonth(base_search=base_search)
if yearmonth is None:
return None

return (
InstitutionalUserReport.search()
.filter('term', report_yearmonth=str(_yearmonth))
.filter('term', institution_id=self.get_institution()._id)
base_search
.filter('term', report_yearmonth=str(yearmonth))
.exclude('term', user_name='Deleted user')
)

Expand Down
Loading