From 5a5a01cf1778c3ae7495208ea14a3e36deb08723 Mon Sep 17 00:00:00 2001
From: Emile NDAGIJIMANA <emile.ndagijimana@apitech.fr>
Date: Mon, 18 Oct 2021 16:58:54 +0200
Subject: [PATCH] [point #3830] Display default weekan logo if there isn't a
 custom one

---
 client/components/main/layouts.jade |  2 +-
 client/components/main/layouts.js   | 14 +++++++++-----
 client/components/main/layouts.styl |  3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index 054d51ca8..bcaf0c026 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -34,7 +34,7 @@ template(name="userFormsLayout")
           img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
           br
       unless currentSetting.customLoginLogoImageUrl
-        if isSettingDatabaseFctCallDone
+        div#isSettingDatabaseCallDone
           img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
           br
       if currentSetting.textBelowCustomLoginLogo
diff --git a/client/components/main/layouts.js b/client/components/main/layouts.js
index 303bf7a10..984507f55 100644
--- a/client/components/main/layouts.js
+++ b/client/components/main/layouts.js
@@ -23,7 +23,7 @@ const validator = {
   },
 };
 
-let isSettingDatabaseFctCallDone = false;
+// let isSettingDatabaseFctCallDone = false;
 
 Template.userFormsLayout.onCreated(function() {
   const templateInstance = this;
@@ -40,7 +40,11 @@ Template.userFormsLayout.onCreated(function() {
         oidcBtnElt.html(htmlvalue);
       }
 
-      isSettingDatabaseFctCallDone = true;
+      // isSettingDatabaseFctCallDone = true;
+      if(currSetting && currSetting !== undefined && currSetting.customLoginLogoImageUrl !== undefined)
+        document.getElementById("isSettingDatabaseCallDone").style.display = 'none';
+      else
+        document.getElementById("isSettingDatabaseCallDone").style.display = 'block';
       return this.stop();
     },
   });
@@ -69,9 +73,9 @@ Template.userFormsLayout.helpers({
     return Template.instance().currentSetting.get();
   },
 
-  isSettingDatabaseCallDone(){
-    return isSettingDatabaseFctCallDone;
-  },
+  // isSettingDatabaseCallDone(){
+  //   return isSettingDatabaseFctCallDone;
+  // },
 
   isLoading() {
     return Template.instance().isLoading.get();
diff --git a/client/components/main/layouts.styl b/client/components/main/layouts.styl
index 5896bbb2e..25ef74feb 100644
--- a/client/components/main/layouts.styl
+++ b/client/components/main/layouts.styl
@@ -542,3 +542,6 @@ a
 
   100%
     transform: rotate(360deg)
+
+#isSettingDatabaseCallDone
+  display: none;