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

Fix lint errors.

Browse source
This commit is contained in:
Lauri Ojansivu 2018-12-21 20:36:26 +02:00
parent bd66ea8acc
commit 417dc9dc42
3 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/main/editor.js
View file

@ -40,7 +40,7 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
const view = this; const view = this;
const currentBoard = Boards.findOne(Session.get('currentBoard')); const currentBoard = Boards.findOne(Session.get('currentBoard'));
if (!currentBoard) { if (!currentBoard) {
return HTML.Raw(""); return HTML.Raw('');
} }
const knowedUsers = currentBoard.members.map((member) => { const knowedUsers = currentBoard.members.map((member) => {
const u = Users.findOne(member.userId); const u = Users.findOne(member.userId);

22
client/components/main/layouts.js
View file

@ -126,16 +126,20 @@ function authentication(instance, email, password) {
: instance.data.defaultAuthenticationMethod.get(); : instance.data.defaultAuthenticationMethod.get();
switch (authenticationMethod) { switch (authenticationMethod) {
case 'ldap': case 'ldap':
// Use the ldap connection package // Use the ldap connection package
Meteor.loginWithLDAP(email, password, function(error) { Meteor.loginWithLDAP(email, password, function(error) {
if (!error) return FlowRouter.go('/'); if (error) {
displayError('error-ldap-login'); displayError('error-ldap-login');
}); return this.stop();
break; } else {
return FlowRouter.go('/');
}
});
break;
default: default:
displayError('error-undefined'); displayError('error-undefined');
} }
return this.stop(); return this.stop();
@ -152,4 +156,4 @@ function displayError(code) {
$('.at-pwd-form').before('<div class="at-error"><p></p></div>'); $('.at-pwd-form').before('<div class="at-error"><p></p></div>');
} }
$('.at-error p').text(translated); $('.at-error p').text(translated);
} }

2
models/settings.js
View file

@ -263,6 +263,6 @@ if (Meteor.isServer) {
getDefaultAuthenticationMethod() { getDefaultAuthenticationMethod() {
return process.env.DEFAULT_AUTHENTICATION_METHOD; return process.env.DEFAULT_AUTHENTICATION_METHOD;
} },
}); });
} }