Browse Source

Remove LINKED_CARDS_ENABLED settings, because it does not work.

Thanks to xet7 !
Lauri Ojansivu 5 years ago
parent
commit
e142acfdb7

+ 1 - 2
.devcontainer/Dockerfile

@@ -108,8 +108,7 @@ ENV \
     CORS="" \
     CORS_ALLOW_HEADERS="" \
     CORS_EXPOSE_HEADERS="" \
-    DEFAULT_AUTHENTICATION_METHOD="" \
-    LINKED_CARDS_ENABLED=true
+    DEFAULT_AUTHENTICATION_METHOD=""
 
 # Install OS
 RUN set -o xtrace \

+ 0 - 4
CHANGELOG.md

@@ -4,10 +4,6 @@ This release adds the following features:
 
 - [Allow card & checklist API creation for authorized board members](https://github.com/wekan/wekan/pull/2854).
   Thanks to Robert-Lebedeu.
-- [Add env var LINKED_CARDS_ENABLED to enable or not linked cards. It is set at true by default](https://github.com/wekan/wekan/pull/2834).
-  Thanks to Akuket.
-- [LINKED_CARDS_ENABLED settings part 2](https://github.com/wekan/wekan/commit/1bf7f95bd8e1f38ad0413861c32dce3b0edb407e).
-  Thanks to xet7.
 - [Visual difference for inactive user in Administration: strikethrough](https://github.com/wekan/wekan/commit/1f1aea87a421ca5e7931d220d10c838574208e2c).
   Thanks to hever and xet7.
 

+ 1 - 2
Dockerfile

@@ -110,8 +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="" \
-    LINKED_CARDS_ENABLED=true
+    DEFAULT_AUTHENTICATION_METHOD=""
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app

+ 3 - 4
client/components/lists/listBody.jade

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

+ 0 - 6
client/components/lists/listBody.js

@@ -377,12 +377,6 @@ BlazeComponent.extendComponent({
   },
 }).register('addCardForm');
 
-Template.addCardForm.helpers({
-  linkedCardsEnabled() {
-    return Meteor.settings.public.linkedCardsEnabled;
-  },
-});
-
 BlazeComponent.extendComponent({
   onCreated() {
     this.selectedBoardId = new ReactiveVar('');

+ 0 - 3
docker-compose.yml

@@ -559,9 +559,6 @@ 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:
       - wekandb
 

+ 0 - 1
sandstorm-pkgdef.capnp

@@ -256,7 +256,6 @@ 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}}")
   ]

+ 4 - 17
server/publications/cards.js

@@ -1,17 +1,4 @@
-if (process.env.LINKED_CARDS_ENABLED === 'false') {
-  Meteor.settings.public.linkedCardsEnabled = 'false';
-  //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 });
-  });
-}
+Meteor.publish('card', cardId => {
+  check(cardId, String);
+  return Cards.find({ _id: cardId });
+});

File diff suppressed because it is too large
+ 0 - 0
snap-src/bin/config


+ 0 - 4
snap-src/bin/wekan-help

@@ -444,10 +444,6 @@ echo -e "Default authentication method."
 echo -e "The default authentication method used if a user does not exist to create and authenticate. Method can be password or ldap."
 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. Default: true"
-echo -e "\t$ snap set $SNAP_NAME linked-cards-enabled='false'"
-echo -e "\n"
 # parse config file for supported settings keys
 echo -e "wekan supports settings keys"
 echo -e "values can be changed by calling\n$ snap set $SNAP_NAME <key name>='<key value>'"

+ 0 - 4
start-wekan.bat

@@ -378,10 +378,6 @@ 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 ..\..

+ 0 - 4
start-wekan.sh

@@ -352,10 +352,6 @@
       # 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

+ 0 - 3
torodb-postgresql/docker-compose.yml

@@ -518,9 +518,6 @@ 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

Some files were not shown because too many files changed in this diff