diff options
Diffstat (limited to 'client/components/main')
-rwxr-xr-x | client/components/main/editor.js | 5 | ||||
-rw-r--r-- | client/components/main/layouts.jade | 1 | ||||
-rw-r--r-- | client/components/main/layouts.js | 41 |
3 files changed, 45 insertions, 2 deletions
diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 888fbe00..20ece562 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -38,7 +38,10 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() { const view = this; const currentBoard = Boards.findOne(Session.get('currentBoard')); const knowedUsers = currentBoard.members.map((member) => { - member.username = Users.findOne(member.userId).username; + const u = Users.findOne(member.userId); + if(u){ + member.username = u.username; + } return member; }); const mentionRegex = /\B@([\w.]*)/gi; diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index ac7da3af..68876dc5 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -18,6 +18,7 @@ template(name="userFormsLayout") img(src="{{pathFor '/wekan-logo.png'}}" alt="Wekan") section.auth-dialog +Template.dynamic(template=content) + +connectionMethod if isCas .at-form button#cas(class='at-btn submit' type='submit') {{casSignInLabel}} diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js index 6d6e616d..1d3c3690 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -39,7 +39,7 @@ Template.userFormsLayout.helpers({ const curLang = T9n.getLanguage() || 'en'; return t9nTag === curLang; }, - +/* isCas() { return Meteor.settings.public && Meteor.settings.public.cas && @@ -49,6 +49,7 @@ Template.userFormsLayout.helpers({ casSignInLabel() { return TAPi18n.__('casSignIn', {}, T9n.getLanguage() || 'en'); }, +*/ }); Template.userFormsLayout.events({ @@ -64,6 +65,44 @@ Template.userFormsLayout.events({ } }); }, + 'submit form'(event) { + const connectionMethod = $('.select-connection').val(); + + // Local account + if (connectionMethod === 'default') { + return; + } + + // TODO : find a way to block "submit #at-pwd-form" of the at_pwd_form.js + + const inputs = event.target.getElementsByTagName('input'); + + const email = inputs.namedItem('at-field-username_and_email').value; + const password = inputs.namedItem('at-field-password').value; + + // Ldap account + if (connectionMethod === 'ldap') { + // Check if the user can use the ldap connection + Meteor.subscribe('user-connection-method', email, { + onReady() { + const ldap = Users.findOne(); + + if (ldap) { + // Use the ldap connection package + Meteor.loginWithLDAP(email, password, function(error) { + if (!error) { + // Connection + return FlowRouter.go('/'); + } else { + return error; + } + }); + } + return this.stop(); + }, + }); + } + }, }); Template.defaultLayout.events({ |