Browse Source

Added remaining WAIT_SPINNER settings.

Thanks to xet7 !

Related https://github.com/wekan/wekan/pull/3858
Lauri Ojansivu 4 years ago
parent
commit
488b765f95

+ 1 - 1
Dockerfile

@@ -138,7 +138,7 @@ ENV BUILD_DEPS="apt-utils libarchive-tools gnupg gosu wget curl bzip2 g++ build-
     SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE="" \
     SAML_ATTRIBUTES="" \
     ORACLE_OIM_ENABLED=false \
-    DEFAULT_WAIT_SPINNER=""
+    WAIT_SPINNER=""
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app

+ 1 - 1
client/lib/spinner.js

@@ -9,7 +9,7 @@ export class Spinner extends BlazeComponent {
 
   getSpinnerName() {
     let ret = 'Bounce';
-    let defaultWaitSpinner = Meteor.settings.public.DEFAULT_WAIT_SPINNER;
+    let defaultWaitSpinner = Meteor.settings.public.WAIT_SPINNER;
     if (defaultWaitSpinner && ALLOWED_WAIT_SPINNERS.includes(defaultWaitSpinner)) {
       ret = defaultWaitSpinner;
     }

+ 2 - 2
docker-compose.yml

@@ -618,8 +618,8 @@ services:
       #- SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE=
       #- SAML_ATTRIBUTES=
       #---------------------------------------------------------------------
-      # Default wait spinner to use
-      # - DEFAULT_WAIT_SPINNER=Bounce
+      # Wait spinner to use
+      # - WAIT_SPINNER=Bounce
       #---------------------------------------------------------------------
     depends_on:
       - wekandb

+ 2 - 2
releases/virtualbox/start-wekan.sh

@@ -382,8 +382,8 @@
       #export SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE=
       #export SAML_ATTRIBUTES=
       #---------------------------------------------------------------------
-      # Default wait spinner to use
-      #export DEFAULT_WAIT_SPINNER=Bounce
+      # Wait spinner to use
+      #export WAIT_SPINNER=Bounce
       #---------------------------------------------------------------------
 
       node main.js & >> ~/repos/wekan.log

+ 1 - 1
server/spinner.js

@@ -1,3 +1,3 @@
 Meteor.startup(() => {
-  Meteor.settings.public.DEFAULT_WAIT_SPINNER = process.env.DEFAULT_WAIT_SPINNER;
+  Meteor.settings.public.WAIT_SPINNER = process.env.WAIT_SPINNER;
 });

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


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

@@ -544,6 +544,9 @@ echo -e "\n"
 echo -e "SAML Attributes."
 echo -e "\t$ snap set $SNAP_NAME saml-attributes=''"
 echo -e "\n"
+echo -e "Wait spinner to use."
+echo -e "\t$ snap set $SNAP_NAME wait-spinner='Bounce'"
+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>'"

+ 2 - 1
start-wekan.bat

@@ -418,6 +418,7 @@ REM SET SAML_IDENTIFIER_FORMAT=
 REM SET SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE=
 REM SET SAML_ATTRIBUTES=
 
-REM SET DEFAULT_WAIT_SPINNER=
+REM # Wait spinner to use
+REM SET WAIT_SPINNER=Bounce
 
 node main.js

+ 2 - 2
start-wekan.sh

@@ -388,8 +388,8 @@
       #export SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE=
       #export SAML_ATTRIBUTES=
       #---------------------------------------------------------------------
-      # Default wait spinner to use
-      #export DEFAULT_WAIT_SPINNER=Bounce
+      # Wait spinner to use
+      #export WAIT_SPINNER=Bounce
       #---------------------------------------------------------------------
       node main.js
       # & >> ../../wekan.log

+ 2 - 2
torodb-postgresql/docker-compose.yml

@@ -559,8 +559,8 @@ services:
       #- SAML_LOCAL_PROFILE_MATCH_ATTRIBUTE=
       #- SAML_ATTRIBUTES=
       #---------------------------------------------------------------------
-      # Default wait spinner to use
-      # - DEFAULT_WAIT_SPINNER=Bounce
+      # Wait spinner to use
+      #- WAIT_SPINNER=Bounce
       #---------------------------------------------------------------------
 
     depends_on:

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