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

LINKED_CARDS_ENABLED settings part 3.

Browse source 
In Progress, linked cards not completely disabled yet.

Thanks to xet7 !
This commit is contained in:
Lauri Ojansivu 2019-12-21 19:38:02 +02:00
parent 7a90e89348
commit e928660bc0
4 changed files with 23 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/components/lists/listBody.jade
View file

@ -49,7 +49,7 @@ template(name="addCardForm")
button.primary.confirm(type="submit") {{_ 'add'}} button.primary.confirm(type="submit") {{_ 'add'}}
unless currentBoard.isTemplatesBoard unless currentBoard.isTemplatesBoard
unless currentBoard.isTemplateBoard unless currentBoard.isTemplateBoard
if linkCardsEnabled if linkedCardsEnabled
span.quiet span.quiet
| {{_ 'or'}} | {{_ 'or'}}
a.js-link {{_ 'link'}} a.js-link {{_ 'link'}}

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

@ -5,17 +5,6 @@ BlazeComponent.extendComponent({
onCreated() { onCreated() {
// for infinite scrolling // for infinite scrolling
this.cardlimit = new ReactiveVar(InfiniteScrollIter); this.cardlimit = new ReactiveVar(InfiniteScrollIter);
this.linkCardsEnabled = new ReactiveVar(true);
Meteor.call('getLinkedCardsEnabled', (error, ret) => {
if (!error && ret) {
this.linkCardsEnabled.set(ret);
}
});
},
linkCardsEnabled() {
return this.linkCardsEnabled.get();
}, },
mixins() { mixins() {
@ -388,6 +377,12 @@ BlazeComponent.extendComponent({
}, },
}).register('addCardForm'); }).register('addCardForm');
Template.addCardForm.helpers({
linkedCardsEnabled() {
return Meteor.settings.public.linkedCardsEnabled;
},
});
BlazeComponent.extendComponent({ BlazeComponent.extendComponent({
onCreated() { onCreated() {
this.selectedBoardId = new ReactiveVar(''); this.selectedBoardId = new ReactiveVar('');

4
models/settings.js
View file

@ -334,10 +334,6 @@ if (Meteor.isServer) {
getDefaultAuthenticationMethod() { getDefaultAuthenticationMethod() {
return process.env.DEFAULT_AUTHENTICATION_METHOD; return process.env.DEFAULT_AUTHENTICATION_METHOD;
}, },
getLinkedCardsEnabled() {
return process.env.LINKED_CARDS_ENABLED === 'true';
}
}); });
} }

30
server/publications/cards.js
View file

@ -1,15 +1,17 @@
Meteor.publish('card', cardId => { if (process.env.LINKED_CARDS_ENABLED === 'false') {
check(cardId, String); Meteor.settings.public.linkedCardsEnabled = 'false';
if (process.env.LINKED_CARDS_ENABLED === 'true') { //Meteor.publish('card', cardId => {
// check(cardId, String);
// // TODO: test
// return Cards.find({
// _id: cardId,
// linkedId: { $ne: [null, ''] },
// });
//});
} else {
Meteor.settings.public.linkedCardsEnabled = 'true';
Meteor.publish('card', cardId => {
check(cardId, String);
return Cards.find({ _id: cardId }); return Cards.find({ _id: cardId });
} else { });
// TODO: test }
return Cards.find({
_id: cardId,
linkedId: {$ne: [
null,
''
]}
});
}
});