Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source 
The default wekan logo appears briefly before displaying the custom logo

Thanks to xet7 !

Related #3832
This commit is contained in:
Lauri Ojansivu 2021-06-01 16:44:23 +03:00
parent 05d6c5f15a
commit e7340c5021
3 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -6,8 +6,6 @@ This release fixes the following bugs:
- [Fixed Python API example: Edit card, etc](https://github.com/wekan/wekan/commit/bf62a947fbfa7d387074550288376e682fd6ad47). - [Fixed Python API example: Edit card, etc](https://github.com/wekan/wekan/commit/bf62a947fbfa7d387074550288376e682fd6ad47).
Thanks to Lucky-Shi and xet7. 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. Thanks to above GitHub users for their contributions and translators for their translations.

5
client/components/main/layouts.jade
View file

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

7
client/components/main/layouts.js
View file

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