Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-27 12:48:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix and update easysearch

Browse source
This commit is contained in:
Daniel Kaiser 2022-08-05 13:06:02 +02:00
parent 3ddb97c8c9
commit 339e044a30
11 changed files with 40 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/components/users/userAvatar.js
View file

@ -7,13 +7,7 @@ import { formatFleURL } from 'meteor/ostrio:files/lib';
Template.userAvatar.helpers({
userData() {
// We need to handle a special case for the search results provided by the
// `matteodem:easy-search` package. Since these results gets published in a
// separate collection, and not in the standard Meteor.Users collection as
// expected, we use a component parameter ("property") to distinguish the
// two cases.
const userCollection = this.esSearch ? ESSearchResults : Users;
return userCollection.findOne(this.userId, {
return Users.findOne(this.userId, {
fields: {
profile: 1,
username: 1,
@ -95,8 +89,7 @@ BlazeComponent.extendComponent({
Template.boardOrgRow.helpers({
orgData() {
const orgCollection = this.esSearch ? ESSearchResults : Org;
return orgCollection.findOne(this.orgId);
return Org.findOne(this.orgId);
},
currentUser(){
return Meteor.user();
@ -158,8 +151,7 @@ BlazeComponent.extendComponent({
Template.boardTeamRow.helpers({
teamData() {
const teamCollection = this.esSearch ? ESSearchResults : Team;
return teamCollection.findOne(this.teamId);
return Team.findOne(this.teamId);
},
currentUser(){
return Meteor.user();