Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Use database when logged in. Continued.

Browse source 
Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2019-11-19 21:55:43 +02:00
parent 975258ef39
commit 115d23f929
5 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -199,7 +199,8 @@ BlazeComponent.extendComponent({
let showDesktopDragHandles = false; let showDesktopDragHandles = false;
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles; showDesktopDragHandles = (currentUser.profile || {})
.showDesktopDragHandles;
} else { } else {
if (cookies.has('showDesktopDragHandles')) { if (cookies.has('showDesktopDragHandles')) {
showDesktopDragHandles = true; showDesktopDragHandles = true;

3
client/components/lists/list.js
View file

@ -122,7 +122,8 @@ BlazeComponent.extendComponent({
let showDesktopDragHandles = false; let showDesktopDragHandles = false;
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles; showDesktopDragHandles = (currentUser.profile || {})
.showDesktopDragHandles;
} else { } else {
if (cookies.has('showDesktopDragHandles')) { if (cookies.has('showDesktopDragHandles')) {
showDesktopDragHandles = true; showDesktopDragHandles = true;

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

@ -713,13 +713,11 @@ BlazeComponent.extendComponent({
.data()._id; .data()._id;
} }
} }
} else { } else if (Utils.boardView() === 'board-view-swimlanes') {
if (Utils.boardView() === 'board-view-swimlanes') { this.swimlaneId = this.parentComponent()
this.swimlaneId = this.parentComponent() .parentComponent()
.parentComponent() .parentComponent()
.parentComponent() .data()._id;
.data()._id;
}
} }
}, },

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

@ -102,7 +102,8 @@ function initSortable(boardComponent, $listsDom) {
let showDesktopDragHandles = false; let showDesktopDragHandles = false;
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles; showDesktopDragHandles = (currentUser.profile || {})
.showDesktopDragHandles;
} else { } else {
import { Cookies } from 'meteor/ostrio:cookies'; import { Cookies } from 'meteor/ostrio:cookies';
const cookies = new Cookies(); const cookies = new Cookies();
@ -203,7 +204,8 @@ BlazeComponent.extendComponent({
let showDesktopDragHandles = false; let showDesktopDragHandles = false;
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
showDesktopDragHandles = (currentUser.profile || {}).showDesktopDragHandles; showDesktopDragHandles = (currentUser.profile || {})
.showDesktopDragHandles;
} else { } else {
import { Cookies } from 'meteor/ostrio:cookies'; import { Cookies } from 'meteor/ostrio:cookies';
const cookies = new Cookies(); const cookies = new Cookies();

12
client/lib/utils.js
View file

@ -10,9 +10,9 @@ Utils = {
cookies.set('boardView', 'board-view-lists'); //true cookies.set('boardView', 'board-view-lists'); //true
} else if (view === 'board-view-swimlanes') { } else if (view === 'board-view-swimlanes') {
cookies.set('boardView', 'board-view-swimlanes'); //true cookies.set('boardView', 'board-view-swimlanes'); //true
//} else if (view === 'board-view-collapse') { //} else if (view === 'board-view-collapse') {
// cookies.set('boardView', 'board-view-swimlane'); //true // cookies.set('boardView', 'board-view-swimlane'); //true
// cookies.set('collapseSwimlane', 'true'); //true // cookies.set('collapseSwimlane', 'true'); //true
} else if (view === 'board-view-cal') { } else if (view === 'board-view-cal') {
cookies.set('boardView', 'board-view-cal'); //true cookies.set('boardView', 'board-view-cal'); //true
} }
@ -29,7 +29,7 @@ Utils = {
boardView() { boardView() {
currentUser = Meteor.user(); currentUser = Meteor.user();
if (currentUser) { if (currentUser) {
return (currentUser.profile || {}).boardView return (currentUser.profile || {}).boardView;
} else { } else {
import { Cookies } from 'meteor/ostrio:cookies'; import { Cookies } from 'meteor/ostrio:cookies';
const cookies = new Cookies(); const cookies = new Cookies();
@ -40,8 +40,8 @@ Utils = {
//&& !cookies.has('collapseSwimlane') //&& !cookies.has('collapseSwimlane')
) { ) {
return 'board-view-swimlanes'; return 'board-view-swimlanes';
//} else if (cookies.has('collapseSwimlane')) { //} else if (cookies.has('collapseSwimlane')) {
// return 'board-view-swimlanes'; // return 'board-view-swimlanes';
} else if (cookies.get('boardView') === 'board-view-cal') { } else if (cookies.get('boardView') === 'board-view-cal') {
return 'board-view-cal'; return 'board-view-cal';
} else { } else {