Reverted PR https://github.com/wekan/wekan/pull/3831

The default wekan logo appears briefly before displaying the custom logo

Thanks to xet7 !

Related #3832

CHANGELOG.md

@@ -6,8 +6,6 @@ This release fixes the following bugs:
 
 - [Fixed Python API example: Edit card, etc](https://github.com/wekan/wekan/commit/bf62a947fbfa7d387074550288376e682fd6ad47).
   Thanks to Lucky-Shi and xet7.
-- [The default wekan logo appears briefly before displaying the custom logo](https://github.com/wekan/wekan/pull/3831).
-  Thanks to Emile840.
 
 Thanks to above GitHub users for their contributions and translators for their translations.
 

client/components/main/layouts.jade

@@ -34,9 +34,8 @@ template(name="userFormsLayout")
           img(src="{{currentSetting.customLoginLogoImageUrl}}" width="300" height="auto")
           br
       unless currentSetting.customLoginLogoImageUrl
-        if isSettingDatabaseFctCallDone
-          img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
-          br
+        img(src="{{pathFor '/wekan-logo.svg'}}" alt="" width="300" height="auto")
+        br
       if currentSetting.textBelowCustomLoginLogo
         +viewer
           | {{currentSetting.textBelowCustomLoginLogo}}

client/components/main/layouts.js

@@ -19,7 +19,7 @@ const validator = {
     return true;
   },
 };
-let isSettingDatabaseFctCallDone = false;
+
 Template.userFormsLayout.onCreated(function() {
   const templateInstance = this;
   templateInstance.currentSetting = new ReactiveVar();
@@ -28,7 +28,6 @@ Template.userFormsLayout.onCreated(function() {
   Meteor.subscribe('setting', {
     onReady() {
       templateInstance.currentSetting.set(Settings.findOne());
-      isSettingDatabaseFctCallDone = true;
       return this.stop();
     },
   });
@@ -56,9 +55,7 @@ Template.userFormsLayout.helpers({
   currentSetting() {
     return Template.instance().currentSetting.get();
   },
-  isSettingDatabaseCallDone(){
-    return isSettingDatabaseFctCallDone;
-  },
+
   isLoading() {
     return Template.instance().isLoading.get();
   },