diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-12-21 22:24:21 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-12-21 22:24:21 +0200 |
commit | 5b227b2b4f65f4af2fd9328f8336111277699d71 (patch) | |
tree | 362622caadaa397d13a4947718e30692c79d26bc /client | |
parent | 16fe2be04d75a968a7a79db330a618a9062522f0 (diff) | |
parent | 96f33e4052f57706c91a1780a2ad7d77da347021 (diff) | |
download | wekan-5b227b2b4f65f4af2fd9328f8336111277699d71.tar.gz wekan-5b227b2b4f65f4af2fd9328f8336111277699d71.tar.bz2 wekan-5b227b2b4f65f4af2fd9328f8336111277699d71.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'client')
-rw-r--r-- | client/components/cards/minicard.jade | 2 | ||||
-rw-r--r-- | client/components/cards/minicard.styl | 13 | ||||
-rw-r--r-- | client/components/lists/list.js | 7 | ||||
-rwxr-xr-x | client/components/main/editor.js | 13 | ||||
-rw-r--r-- | client/components/main/layouts.jade | 1 | ||||
-rw-r--r-- | client/components/main/layouts.js | 109 | ||||
-rw-r--r-- | client/components/settings/connectionMethod.jade | 6 | ||||
-rw-r--r-- | client/components/settings/connectionMethod.js | 34 |
8 files changed, 91 insertions, 94 deletions
diff --git a/client/components/cards/minicard.jade b/client/components/cards/minicard.jade index f23e91b3..0dfcee44 100644 --- a/client/components/cards/minicard.jade +++ b/client/components/cards/minicard.jade @@ -9,6 +9,8 @@ template(name="minicard") each labels .minicard-label(class="card-label-{{color}}" title="{{name}}") .minicard-title + .handle + .fa.fa-arrows if $eq 'prefix-with-full-path' currentBoard.presentParentTask .parent-prefix | {{ parentString ' > ' }} diff --git a/client/components/cards/minicard.styl b/client/components/cards/minicard.styl index 8fec7238..7ad51161 100644 --- a/client/components/cards/minicard.styl +++ b/client/components/cards/minicard.styl @@ -94,6 +94,19 @@ .minicard-custom-field-item max-width:50%; flex-grow:1; + .handle + width: 20px; + height: 20px; + position: absolute; + right: 5px; + top: 5px; + display:none; + @media only screen and (max-width: 1199px) { + display:block; + } + .fa-arrows + font-size:20px; + color: #ccc; .minicard-title p:last-child margin-bottom: 0 diff --git a/client/components/lists/list.js b/client/components/lists/list.js index 00908faa..043cb77c 100644 --- a/client/components/lists/list.js +++ b/client/components/lists/list.js @@ -26,6 +26,13 @@ BlazeComponent.extendComponent({ const itemsSelector = '.js-minicard:not(.placeholder, .js-card-composer)'; const $cards = this.$('.js-minicards'); + + if(window.matchMedia('(max-width: 1199px)').matches) { + $( '.js-minicards' ).sortable({ + handle: '.handle', + }); + } + $cards.sortable({ connectWith: '.js-minicards:not(.js-list-full)', tolerance: 'pointer', diff --git a/client/components/main/editor.js b/client/components/main/editor.js index 20ece562..152f69e2 100755 --- a/client/components/main/editor.js +++ b/client/components/main/editor.js @@ -9,10 +9,12 @@ Template.editor.onRendered(() => { match: /\B@([\w.]*)$/, search(term, callback) { const currentBoard = Boards.findOne(Session.get('currentBoard')); - callback(currentBoard.activeMembers().map((member) => { - const username = Users.findOne(member.userId).username; - return username.includes(term) ? username : null; - }).filter(Boolean)); + if (currentBoard) { + callback(currentBoard.activeMembers().map((member) => { + const username = Users.findOne(member.userId).username; + return username.includes(term) ? username : null; + }).filter(Boolean)); + } }, template(value) { return value; @@ -37,6 +39,9 @@ const at = HTML.CharRef({html: '@', str: '@'}); Blaze.Template.registerHelper('mentions', new Template('mentions', function() { const view = this; const currentBoard = Boards.findOne(Session.get('currentBoard')); + if (!currentBoard) { + return HTML.Raw(''); + } const knowedUsers = currentBoard.members.map((member) => { const u = Users.findOne(member.userId); if(u){ diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade index 55ee2686..1c22fee6 100644 --- a/client/components/main/layouts.jade +++ b/client/components/main/layouts.jade @@ -23,7 +23,6 @@ template(name="userFormsLayout") br 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 a50d167e..89dcca2d 100644 --- a/client/components/main/layouts.js +++ b/client/components/main/layouts.js @@ -6,29 +6,14 @@ const i18nTagToT9n = (i18nTag) => { return i18nTag; }; -const validator = { - set(obj, prop, value) { - if (prop === 'state' && value !== 'signIn') { - $('.at-form-authentication').hide(); - } else if (prop === 'state' && value === 'signIn') { - $('.at-form-authentication').show(); - } - // The default behavior to store the value - obj[prop] = value; - // Indicate success - return true; - }, -}; - -Template.userFormsLayout.onCreated(() => { +Template.userFormsLayout.onCreated(function() { + Meteor.call('getDefaultAuthenticationMethod', (error, result) => { + this.data.defaultAuthenticationMethod = new ReactiveVar(error ? undefined : result); + }); Meteor.subscribe('setting'); - }); Template.userFormsLayout.onRendered(() => { - - AccountsTemplates.state.form.keys = new Proxy(AccountsTemplates.state.form.keys, validator); - const i18nTag = navigator.language; if (i18nTag) { T9n.setLanguage(i18nTagToT9n(i18nTag)); @@ -101,13 +86,11 @@ Template.userFormsLayout.events({ } }); }, - 'click #at-btn'(event) { - /* All authentication method can be managed/called here. - !! DON'T FORGET to correctly fill the fields of the user during its creation if necessary authenticationMethod : String !! - */ - const authenticationMethodSelected = $('.select-authentication').val(); - // Local account - if (authenticationMethodSelected === 'password') { + 'click #at-btn'(event, instance) { + const email = $('#at-field-username_and_email').val(); + const password = $('#at-field-password').val(); + + if (FlowRouter.getRouteName() !== 'atSignIn' || password === '' || email === '') { return; } @@ -115,29 +98,11 @@ Template.userFormsLayout.events({ event.preventDefault(); event.stopImmediatePropagation(); - const email = $('#at-field-username_and_email').val(); - const password = $('#at-field-password').val(); - - // Ldap account - if (authenticationMethodSelected === 'ldap') { - // Check if the user can use the ldap connection - Meteor.subscribe('user-authenticationMethod', email, { - onReady() { - const user = Users.findOne(); - if (user === undefined || user.authenticationMethod === 'ldap') { - // Use the ldap connection package - Meteor.loginWithLDAP(email, password, function(error) { - if (!error) { - // Connection - return FlowRouter.go('/'); - } - return error; - }); - } - return this.stop(); - }, - }); - } + Meteor.subscribe('user-authenticationMethod', email, { + onReady() { + return authentication.call(this, instance, email, password); + }, + }); }, }); @@ -146,3 +111,49 @@ Template.defaultLayout.events({ Modal.close(); }, }); + +function authentication(instance, email, password) { + const user = Users.findOne(); + + // Authentication with password + if (user && user.authenticationMethod === 'password') { + $('#at-pwd-form').submit(); + return this.stop(); + } + + const authenticationMethod = user + ? user.authenticationMethod + : instance.data.defaultAuthenticationMethod.get(); + + switch (authenticationMethod) { + case 'ldap': + // Use the ldap connection package + Meteor.loginWithLDAP(email, password, function(error) { + if (error) { + displayError('error-ldap-login'); + return this.stop(); + } else { + return FlowRouter.go('/'); + } + }); + break; + + default: + displayError('error-undefined'); + } + + return this.stop(); +} + +function displayError(code) { + const translated = TAPi18n.__(code); + + if (translated === code) { + return; + } + + if(!$('.at-error').length) { + $('.at-pwd-form').before('<div class="at-error"><p></p></div>'); + } + $('.at-error p').text(translated); +} diff --git a/client/components/settings/connectionMethod.jade b/client/components/settings/connectionMethod.jade deleted file mode 100644 index ac4c8c64..00000000 --- a/client/components/settings/connectionMethod.jade +++ /dev/null @@ -1,6 +0,0 @@ -template(name='connectionMethod') - div.at-form-authentication - label {{_ 'authentication-method'}} - select.select-authentication - each authentications - option(value="{{value}}") {{_ value}} diff --git a/client/components/settings/connectionMethod.js b/client/components/settings/connectionMethod.js deleted file mode 100644 index 9fe8f382..00000000 --- a/client/components/settings/connectionMethod.js +++ /dev/null @@ -1,34 +0,0 @@ -Template.connectionMethod.onCreated(function() { - this.authenticationMethods = new ReactiveVar([]); - - Meteor.call('getAuthenticationsEnabled', (_, result) => { - if (result) { - // TODO : add a management of different languages - // (ex {value: ldap, text: TAPi18n.__('ldap', {}, T9n.getLanguage() || 'en')}) - this.authenticationMethods.set([ - {value: 'password'}, - // Gets only the authentication methods availables - ...Object.entries(result).filter((e) => e[1]).map((e) => ({value: e[0]})), - ]); - } - - // If only the default authentication available, hides the select boxe - const content = $('.at-form-authentication'); - if (!(this.authenticationMethods.get().length > 1)) { - content.hide(); - } else { - content.show(); - } - }); -}); - -Template.connectionMethod.onRendered(() => { - // Moves the select boxe in the first place of the at-pwd-form div - $('.at-form-authentication').detach().prependTo('.at-pwd-form'); -}); - -Template.connectionMethod.helpers({ - authentications() { - return Template.instance().authenticationMethods.get(); - }, -}); |