github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-22 13:07:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

finish prepare for test

Browse source
This commit is contained in:
guillaume 2018-11-23 18:04:05 +01:00
parent f23448be33
commit 745bd7e806
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,11 +6,11 @@ const i18nTagToT9n = (i18nTag) => {
return i18nTag;
};
Template.userFormsLayout.onCreated(() => {
Meteor.subscribe('setting');
Template.userFormsLayout.onCreated(function() {
Meteor.call('getDefaultAuthenticationMethod', (error, result) => {
this.data.defaultAuthenticationMethod = new ReactiveVar(error ? undefined : result);
});
Meteor.subscribe('setting');
});
Template.userFormsLayout.onRendered(() => {
@ -83,7 +83,7 @@ Template.userFormsLayout.events({
const email = $('#at-field-username_and_email').val();
const password = $('#at-field-password').val();
if (FlowRouter.getRouteName() !== 'atSignIn' || password === '') {
if (FlowRouter.getRouteName() !== 'atSignIn' || password === '' || email === '') {
return;
}
@ -132,5 +132,10 @@ function authentication(instance, email, password) {
return error;
});
}
/* else {
process.env.DEFAULT_AUTHENTICATION_METHOD is not defined
} */
return this.stop();
}