Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-01-29 04:36:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix #1567

Browse source
This commit is contained in:
Andrés Manelli 2018-04-16 14:33:53 -03:00
parent c12e003fd3
commit e5995477b8
8 changed files with 44 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,15 +87,13 @@ BlazeComponent.extendComponent({
},
isViewSwimlanes() {
const currentBoardId = Session.get('currentBoard');
const board = Boards.findOne(currentBoardId);
return (board.view === 'board-view-swimlanes');
const currentUser = Meteor.user();
return (currentUser.profile.boardView === 'board-view-swimlanes');
},
isViewLists() {
const currentBoardId = Session.get('currentBoard');
const board = Boards.findOne(currentBoardId);
return (board.view === 'board-view-lists');
const currentUser = Meteor.user();
return (currentUser.profile.boardView === 'board-view-lists');
},
openNewListForm() {

2
client/components/boards/boardHeader.jade
View file

@ -95,7 +95,7 @@ template(name="boardHeaderBar")
a.board-header-btn.js-toggle-board-view(
title="{{_ 'board-view'}}")
i.fa.fa-th-large
span {{_ currentBoard.view}}
span {{_ currentUser.profile.boardView}}
if canModifyBoard
a.board-header-btn.js-multiselection-activate(

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

@ -77,19 +77,11 @@ BlazeComponent.extendComponent({
Modal.open('archivedBoards');
},
'click .js-toggle-board-view'() {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
if (currentBoard.view === 'board-view-swimlanes') {
Boards.update(currentBoard._id, {
$set: {
view: 'board-view-lists',
},
});
} else if (currentBoard.view === 'board-view-lists') {
Boards.update(currentBoard._id, {
$set: {
view: 'board-view-swimlanes',
},
});
const currentUser = Meteor.user();
if (currentUser.profile.boardView === 'board-view-swimlanes') {
currentUser.setBoardView('board-view-lists');
} else if (currentUser.profile.boardView === 'board-view-lists') {
currentUser.setBoardView('board-view-swimlanes');
}
},
'click .js-open-filter-view'() {

10
client/components/lists/listBody.js
View file

@ -37,11 +37,11 @@ BlazeComponent.extendComponent({
const labelIds = formComponent.labels.get();
const boardId = this.data().board()._id;
const board = Boards.findOne(boardId);
let swimlaneId = '';
if (board.view === 'board-view-swimlanes')
const boardView = Meteor.user().profile.boardView;
if (boardView === 'board-view-swimlanes')
swimlaneId = this.parentComponent().parentComponent().data()._id;
else
else if (boardView === 'board-view-lists')
swimlaneId = Swimlanes.findOne({boardId})._id;
if (title) {
@ -106,8 +106,8 @@ BlazeComponent.extendComponent({
},
idOrNull(swimlaneId) {
const board = Boards.findOne(Session.get('currentBoard'));
if (board.view === 'board-view-swimlanes')
const currentUser = Meteor.user();
if (currentUser.profile.boardView === 'board-view-swimlanes')
return swimlaneId;
return undefined;
},

7
client/components/swimlanes/swimlanes.js
View file

@ -2,11 +2,10 @@ const { calculateIndex } = Utils;
function currentCardIsInThisList(listId, swimlaneId) {
const currentCard = Cards.findOne(Session.get('currentCard'));
const currentBoardId = Session.get('currentBoard');
const board = Boards.findOne(currentBoardId);
if (board.view === 'board-view-lists')
const currentUser = Meteor.user();
if (currentUser.profile.boardView === 'board-view-lists')
return currentCard && currentCard.listId === listId;
else if (board.view === 'board-view-swimlanes')
else if (currentUser.profile.boardView === 'board-view-swimlanes')
return currentCard && currentCard.listId === listId && currentCard.swimlaneId === swimlaneId;
else
return false;