summaryrefslogtreecommitdiffstats
path: root/client/components
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-12-20 16:12:29 +0200
committerGitHub <noreply@github.com>2019-12-20 16:12:29 +0200
commit492ed2bdc2b7e2e228109f4d411dd99b794b9ff7 (patch)
tree15ee59d15acc4883fe301a476e05df01e20cb62a /client/components
parentafe7d4991d09192d416cc1f82c85e5febe22487e (diff)
parentc77979ff134b91fa6c7226520c1463a62ea2eac0 (diff)
downloadwekan-492ed2bdc2b7e2e228109f4d411dd99b794b9ff7.tar.gz
wekan-492ed2bdc2b7e2e228109f4d411dd99b794b9ff7.tar.bz2
wekan-492ed2bdc2b7e2e228109f4d411dd99b794b9ff7.zip
Merge pull request #2834 from Akuket/master
Issue #2688
Diffstat (limited to 'client/components')
-rw-r--r--client/components/lists/listBody.jade7
-rw-r--r--client/components/lists/listBody.js11
2 files changed, 15 insertions, 3 deletions
diff --git a/client/components/lists/listBody.jade b/client/components/lists/listBody.jade
index 2f175205..517b9d93 100644
--- a/client/components/lists/listBody.jade
+++ b/client/components/lists/listBody.jade
@@ -49,9 +49,10 @@ template(name="addCardForm")
button.primary.confirm(type="submit") {{_ 'add'}}
unless currentBoard.isTemplatesBoard
unless currentBoard.isTemplateBoard
- span.quiet
- | {{_ 'or'}}
- a.js-link {{_ 'link'}}
+ if linkCardsEnabled
+ span.quiet
+ | {{_ 'or'}}
+ a.js-link {{_ 'link'}}
span.quiet
| &nbsp;
| /
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index b0974705..6ed95a2a 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -5,6 +5,17 @@ BlazeComponent.extendComponent({
onCreated() {
// for infinite scrolling
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() {