From 91444cce9b0492fb4f5a45183e8cd8c9ae103e1a Mon Sep 17 00:00:00 2001 From: hekatomb Date: Fri, 7 Jun 2024 19:58:12 +0200 Subject: [PATCH] Fill out Org and Team in adminReports --- client/components/settings/adminReports.jade | 3 ++- client/components/settings/adminReports.js | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/client/components/settings/adminReports.jade b/client/components/settings/adminReports.jade index 955709ef8..1d6e35b16 100644 --- a/client/components/settings/adminReports.jade +++ b/client/components/settings/adminReports.jade @@ -138,7 +138,6 @@ template(name="boardsReport") th Members th Organizations th Teams - each board in results tbody tr @@ -148,5 +147,7 @@ template(name="boardsReport") td = yesOrNo(board.archived) td {{userNames board.members }} + td {{orgs board.orgs }} + td {{teams board.teams }} else div {{_ 'no-results' }} diff --git a/client/components/settings/adminReports.js b/client/components/settings/adminReports.js index ef364fb1b..23a438347 100644 --- a/client/components/settings/adminReports.js +++ b/client/components/settings/adminReports.js @@ -170,8 +170,27 @@ class AdminReport extends BlazeComponent { .join(", "); return ret; } + teams(memberTeams) { + const ret = (memberTeams || []) + .map(_memberTeam => { + const _ret = ReactiveCache.getTeam(_memberTeam.teamId)?.teamDisplayName || _memberTeam.teamId; + return _ret; + }) + .join(", "); + return ret; + } + orgs(orgs) { + const ret = (orgs || []) + .map(_orgs => { + const _ret = ReactiveCache.getOrg(_orgs.orgId)?.orgDisplayName || _orgs.orgId; + return _ret; + }) + .join(", "); + return ret; + } }.register('boardsReport')); + (class extends AdminReport { collection = Cards;