From 1bf7f95bd8e1f38ad0413861c32dce3b0edb407e Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 20 Dec 2019 16:32:38 +0200
Subject: LINKED_CARDS_ENABLED settings part 2.

Thanks to xet7 !
---
 .devcontainer/Dockerfile             | 3 ++-
 Dockerfile                           | 2 +-
 docker-compose.yml                   | 4 ++--
 sandstorm-pkgdef.capnp               | 1 +
 snap-src/bin/wekan-help              | 2 +-
 start-wekan.bat                      | 6 +++++-
 start-wekan.sh                       | 6 +++++-
 torodb-postgresql/docker-compose.yml | 3 +++
 8 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fa17ff1f..9a599e86 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -108,7 +108,8 @@ ENV \
     CORS="" \
     CORS_ALLOW_HEADERS="" \
     CORS_EXPOSE_HEADERS="" \
-    DEFAULT_AUTHENTICATION_METHOD=""
+    DEFAULT_AUTHENTICATION_METHOD="" \
+    LINKED_CARDS_ENABLED=true
 
 # Install OS
 RUN set -o xtrace \
diff --git a/Dockerfile b/Dockerfile
index 24dfb1ac..c36ee5aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -110,7 +110,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     CORS="" \
     CORS_ALLOW_HEADERS="" \
     CORS_EXPOSE_HEADERS="" \
-    DEFAULT_AUTHENTICATION_METHOD=""
+    DEFAULT_AUTHENTICATION_METHOD="" \
     LINKED_CARDS_ENABLED=true
 
 # Copy the app to the image
diff --git a/docker-compose.yml b/docker-compose.yml
index cfe645f1..d495bf97 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -560,8 +560,8 @@ services:
       #- LOGOUT_ON_MINUTES=
       #-------------------------------------------------------------------
       # LINKED_CARDS_ENABLED : Enable or not the linked cards feature
-      # example : LINKED_CARDS_ENABLED=false
-      - LINKED_CARDS_ENABLED=true
+      # Default: true
+      #- LINKED_CARDS_ENABLED=false
     depends_on:
       - wekandb
 
diff --git a/sandstorm-pkgdef.capnp b/sandstorm-pkgdef.capnp
index 2f9a0020..c7d78410 100644
--- a/sandstorm-pkgdef.capnp
+++ b/sandstorm-pkgdef.capnp
@@ -256,6 +256,7 @@ const myCommand :Spk.Manifest.Command = (
     (key = "OAUTH2_USERINFO_ENDPOINT", value=""),
     (key = "OAUTH2_TOKEN_ENDPOINT", value=""),
     (key = "LDAP_ENABLE", value="false"),
+    (key = "LINKED_CARDS_ENABLED", value="true"),
     (key = "SANDSTORM", value="1"),
     (key = "METEOR_SETTINGS", value = "{\"public\": {\"sandstorm\": true}}")
   ]
diff --git a/snap-src/bin/wekan-help b/snap-src/bin/wekan-help
index 84dd9d83..42fd6f21 100755
--- a/snap-src/bin/wekan-help
+++ b/snap-src/bin/wekan-help
@@ -445,7 +445,7 @@ echo -e "The default authentication method used if a user does not exist to crea
 echo -e "\t$ snap set $SNAP_NAME default-authentication-method='ldap'"
 echo -e "\n"
 echo -e "Linked cards enabled."
-echo -e "Enable or not the linked cards feature."
+echo -e "Enable or not the linked cards feature. Default: true"
 echo -e "\t$ snap set $SNAP_NAME linked-cards-enabled='false'"
 echo -e "\n"
 # parse config file for supported settings keys
diff --git a/start-wekan.bat b/start-wekan.bat
index 63eeebe3..9bcab655 100755
--- a/start-wekan.bat
+++ b/start-wekan.bat
@@ -64,7 +64,7 @@ REM # https://github.com/wekan/wekan/pull/2536
 REM # System timelines will be showing any user modification for
 REM # dueat startat endat receivedat, also notification to
 REM # the watchers and if any card is due, about due or past due.
-REM # Notify due days, default is None. 
+REM # Notify due days, default is None.
 REM # SET NOTIFY_DUE_DAYS_BEFORE_AND_AFTER=2,0
 REM # Notify due at hour of day. Default every morning at 8am. Can be 0-23.
 REM # If env variable has parsing error, use default. Notification sent to watchers.
@@ -378,6 +378,10 @@ REM # LOGOUT_ON_MINUTES : The number of minutes
 REM # example : LOGOUT_ON_MINUTES=55
 REM SET LOGOUT_ON_MINUTES=
 
+REM # LINKED_CARDS_ENABLED : Enable or not the linked cards feature
+REM # Default: true
+REM SET LINKED_CARDS_ENABLED=false
+
 cd .build\bundle
 node main.js
 cd ..\..
diff --git a/start-wekan.sh b/start-wekan.sh
index 35f663db..87c41f2c 100755
--- a/start-wekan.sh
+++ b/start-wekan.sh
@@ -71,7 +71,7 @@
       # dueat startat endat receivedat, also notification to
       # the watchers and if any card is due, about due or past due.
       #
-      # Notify due days, default is None. 
+      # Notify due days, default is None.
       #export NOTIFY_DUE_DAYS_BEFORE_AND_AFTER=2,0
       # it will notify user 2 days before due day and on the due day
       #
@@ -352,6 +352,10 @@
       # LOGOUT_ON_MINUTES : The number of minutes
       # example : LOGOUT_ON_MINUTES=55
       #export LOGOUT_ON_MINUTES=
+      #-------------------------------------------------------------------
+      # LINKED_CARDS_ENABLED : Enable or not the linked cards feature
+      # Default: true
+      #export LINKED_CARDS_ENABLED=false
 
       node main.js
       # & >> ../../wekan.log
diff --git a/torodb-postgresql/docker-compose.yml b/torodb-postgresql/docker-compose.yml
index 7a7ad9c8..12b8287d 100644
--- a/torodb-postgresql/docker-compose.yml
+++ b/torodb-postgresql/docker-compose.yml
@@ -518,6 +518,9 @@ services:
       # example : LOGOUT_ON_MINUTES=55
       #- LOGOUT_ON_MINUTES=
       #-------------------------------------------------------------------
+      # LINKED_CARDS_ENABLED : Enable or not the linked cards feature
+      # Default: true
+      #- LINKED_CARDS_ENABLED=false
 
     depends_on:
       - mongodb
-- 
cgit v1.2.3-1-g7c22