Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-11 02:34:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'edge' into meteor-1.8

Browse source
This commit is contained in:
Lauri Ojansivu 2019-03-14 00:41:55 +02:00
commit 909a23e529
7 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/boards/boardsList.js
View file

@ -25,7 +25,7 @@ BlazeComponent.extendComponent({
archived: false,
'members.userId': Meteor.userId(),
type: 'board',
}, { sort: [['stars', 'desc'], ['color', 'asc'], ['title', 'asc'], ['description', 'asc'], ['_id', 'asc']] });
}, { sort: ['title'] });
},
isStarred() {
const user = Meteor.user();

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

@ -105,10 +105,10 @@ async function authentication(event, instance) {
// If header login id is set, use it for login.
// Header username = Email address
// Header password = Login ID
// Not user currently: req.headers[process.env.HEADER_LOGIN_FIRSTNAME]
// and req.headers[process.env.HEADER_LOGIN_LASTNAME]
const match = req.headers[process.env.HEADER_LOGIN_EMAIL] || $('#at-field-username_and_email').val();
const password = req.headers[process.env.HEADER_LOGIN_ID] || $('#at-field-password').val();
// Not user currently: request.headers[Meteor.settings.public.headerLoginFirstname]
// and request.headers[Meteor.settings.public.headerLoginLastname]
const match = request.headers[Meteor.settings.public.headerLoginEmail] || $('#at-field-username_and_email').val();
const password = request.headers[Meteor.settings.public.headerLoginId] || $('#at-field-password').val();
if (!match || !password) return;
@ -117,7 +117,7 @@ async function authentication(event, instance) {
if (result === 'password') return;
// If header login id is not set, don't try to login automatically.
if (!process.env.HEADER_LOGIN_ID) {
if (!Meteor.settings.public.headerLoginId) {
// Stop submit #at-pwd-form
event.preventDefault();
event.stopImmediatePropagation();