add full name if exists in email-invite-subject or when tagging someone with '@' while commenting a card

This commit is contained in:
Emile NDAGIJIMANA 2021-10-18 15:26:01 +02:00
parent b12312f998
commit d9329a9e15
6 changed files with 23 additions and 7 deletions

View file

@ -17,8 +17,10 @@ Template.editor.onRendered(() => {
currentBoard
.activeMembers()
.map(member => {
const username = Users.findOne(member.userId).username;
return username.includes(term) ? username : null;
const user = Users.findOne(member.userId);
const username = user.username;
const fullName = user.profile && user.profile !== undefined ? user.profile.fullname : "";
return username.includes(term) || fullName.includes(term) ? fullName + "(" + username + ")" : null;
})
.filter(Boolean), [...specialHandleNames])
);

View file

@ -34,8 +34,9 @@ template(name="userFormsLayout")
img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
br
unless currentSetting.customLoginLogoImageUrl
img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
br
if isSettingDatabaseFctCallDone
img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
br
if currentSetting.textBelowCustomLoginLogo
+viewer
| {{currentSetting.textBelowCustomLoginLogo}}

View file

@ -23,6 +23,8 @@ const validator = {
},
};
let isSettingDatabaseFctCallDone = false;
Template.userFormsLayout.onCreated(function() {
const templateInstance = this;
templateInstance.currentSetting = new ReactiveVar();
@ -37,6 +39,8 @@ Template.userFormsLayout.onCreated(function() {
let htmlvalue = "<i class='fa fa-oidc'></i>" + currSetting.oidcBtnText;
oidcBtnElt.html(htmlvalue);
}
isSettingDatabaseFctCallDone = true;
return this.stop();
},
});
@ -65,6 +69,10 @@ Template.userFormsLayout.helpers({
return Template.instance().currentSetting.get();
},
isSettingDatabaseCallDone(){
return isSettingDatabaseFctCallDone;
},
isLoading() {
return Template.instance().isLoading.get();
},

View file

@ -25,7 +25,7 @@ Template.memberMenuPopup.helpers({
isNotOAuth2AuthenticationMethod(){
currentUser = Meteor.user();
if (currentUser) {
return currentUser.authenticationMethod != 'OAuth2';
return currentUser.authenticationMethod.toLowerCase() != 'oauth2';
} else {
return true;
}