Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-03-07 22:22:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into sort-fix

Browse source
This commit is contained in:
ednamaeG 2021-03-31 14:56:55 +08:00 • committed by GitHub
commit bc7b18abe7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
138 changed files with 27796 additions and 4618 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -360,7 +360,7 @@ BlazeComponent.extendComponent({
end: end || card.endAt,
allDay:
Math.abs(end.getTime() - start.getTime()) / 1000 === 24 * 3600,
url: FlowRouter.url('card', {
url: FlowRouter.path('card', {
boardId: currentBoard._id,
slug: currentBoard.slug,
cardId: card._id,

8
client/components/boards/boardHeader.js
View file

@ -130,7 +130,7 @@ BlazeComponent.extendComponent({
Filter.reset();
},
'click .js-sort-reset'() {
Session.set('sortBy','')
Session.set('sortBy', '');
},
'click .js-open-search-view'() {
Sidebar.setView('search');
@ -165,9 +165,9 @@ Template.boardHeaderBar.helpers({
boardView() {
return Utils.boardView();
},
isSortActive(){
isSortActive() {
return Session.get('sortBy') ? true : false;
}
},
});
Template.boardChangeViewPopup.events({
@ -412,7 +412,7 @@ BlazeComponent.extendComponent({
Session.set('sortBy', sortBy);
sortCardsBy.set(TAPi18n.__('date-created-oldest-first'));
Popup.close();
}
},
},
];
},