mirror of
https://github.com/wekan/wekan.git
synced 2025-12-16 23:40:13 +01:00
parent
216de59aba
commit
69250d0ae8
4 changed files with 10 additions and 3 deletions
|
|
@ -106,6 +106,7 @@ globals:
|
|||
Avatars: true
|
||||
BlazeComponent: false
|
||||
BlazeLayout: false
|
||||
ESSearchResults: false
|
||||
FlowRouter: false
|
||||
FS: false
|
||||
getSlug: false
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ template(name="addMemberPopup")
|
|||
+esEach(index="users")
|
||||
li.item.js-member-item(class="{{#if isBoardMember}}disabled{{/if}}")
|
||||
a.name.js-select-member(title="{{profile.name}} ({{username}})")
|
||||
+userAvatar(userId=_id)
|
||||
+userAvatar(userId=_id esSearch=true)
|
||||
span.full-name
|
||||
= profile.name
|
||||
| (<span class="username">{{username}}</span>)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,13 @@ Meteor.subscribe('my-avatars');
|
|||
|
||||
Template.userAvatar.helpers({
|
||||
userData() {
|
||||
return Users.findOne(this.userId, {
|
||||
// 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, {
|
||||
fields: {
|
||||
profile: 1,
|
||||
username: 1,
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Users = Meteor.users;
|
|||
const searchInFields = ['username', 'profile.name'];
|
||||
Users.initEasySearch(searchInFields, {
|
||||
use: 'mongo-db',
|
||||
returnFields: searchInFields,
|
||||
returnFields: [...searchInFields, 'profile.avatarUrl'],
|
||||
});
|
||||
|
||||
Users.helpers({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue