summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2020-06-08 17:28:53 +0300
committerLauri Ojansivu <x@xet7.org>2020-06-08 17:28:53 +0300
commit8c3322f9a93c321e8a2cc5cfcd4b1d6316a5fb7c (patch)
treeaafc106e32108ff5e9c8eb51811a69e7c9e6f990 /client
parentf935cf391e042c6268a34cfaef28391cbaaac93c (diff)
downloadwekan-8c3322f9a93c321e8a2cc5cfcd4b1d6316a5fb7c.tar.gz
wekan-8c3322f9a93c321e8a2cc5cfcd4b1d6316a5fb7c.tar.bz2
wekan-8c3322f9a93c321e8a2cc5cfcd4b1d6316a5fb7c.zip
Change default view to Swimlanes.
Thanks to xet7 !
Diffstat (limited to 'client')
-rw-r--r--client/components/boards/boardHeader.jade2
-rw-r--r--client/components/swimlanes/swimlanes.js11
2 files changed, 10 insertions, 3 deletions
diff --git a/client/components/boards/boardHeader.jade b/client/components/boards/boardHeader.jade
index 4c0edac4..a8bdc8c5 100644
--- a/client/components/boards/boardHeader.jade
+++ b/client/components/boards/boardHeader.jade
@@ -105,7 +105,7 @@ template(name="boardHeaderBar")
i.fa.fa-th-large
if $eq boardView 'board-view-cal'
i.fa.fa-calendar
- span {{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-lists'}}{{/if}}
+ span {{#if boardView}}{{_ boardView}}{{else}}{{_ 'board-view-swimlanes'}}{{/if}}
if canModifyBoard
a.board-header-btn.js-multiselection-activate(
diff --git a/client/components/swimlanes/swimlanes.js b/client/components/swimlanes/swimlanes.js
index 753fa88b..bfb07530 100644
--- a/client/components/swimlanes/swimlanes.js
+++ b/client/components/swimlanes/swimlanes.js
@@ -23,8 +23,15 @@ function currentCardIsInThisList(listId, swimlaneId) {
currentCard.listId === listId &&
currentCard.swimlaneId === swimlaneId
);
- // Default view: board-view-lists
- else return currentCard && currentCard.listId === listId;
+ // OLD: Default view: board-view-lists
+ ////else return currentCard && currentCard.listId === listId;
+ // NEW: Default view: board-view-swimlanes
+else return (
+ currentCard &&
+ currentCard.listId === listId &&
+ currentCard.swimlaneId === swimlaneId
+);
+
// https://github.com/wekan/wekan/issues/1623
// https://github.com/ChronikEwok/wekan/commit/cad9b20451bb6149bfb527a99b5001873b06c3de
// TODO: In public board, if you would like to switch between List/Swimlane view, you could