Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge pull request #5440 from Hekatomb/bugfix/TeamsOrgAdminCard

Browse source 
Fill out Org and Team in adminReports
This commit is contained in:
Lauri Ojansivu 2024-06-10 16:19:48 +03:00 • committed by GitHub
commit 55fb7a8f27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/components/settings/adminReports.jade
View file

@ -138,7 +138,6 @@ template(name="boardsReport")
th Members th Members
th Organizations th Organizations
th Teams th Teams
each board in results each board in results
tbody tbody
tr tr
@ -148,5 +147,7 @@ template(name="boardsReport")
td td
= yesOrNo(board.archived) = yesOrNo(board.archived)
td {{userNames board.members }} td {{userNames board.members }}
td {{orgs board.orgs }}
td {{teams board.teams }}
else else
div {{_ 'no-results' }} div {{_ 'no-results' }}

19
client/components/settings/adminReports.js
View file

@ -170,8 +170,27 @@ class AdminReport extends BlazeComponent {
.join(", "); .join(", ");
return ret; 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')); }.register('boardsReport'));
(class extends AdminReport { (class extends AdminReport {
collection = Cards; collection = Cards;