From 408fa61d07480afd34dbae0e6b171fe52cf69e3c Mon Sep 17 00:00:00 2001 From: Andreas Linde Date: Tue, 28 Jul 2020 12:03:12 +0200 Subject: [PATCH] Fixed configured detection --- assets/js/app.js | 10 ++++-- server/assets.go | 91 ++++++++++++++++++++++++------------------------ server/http.go | 2 +- 3 files changed, 54 insertions(+), 49 deletions(-) diff --git a/assets/js/app.js b/assets/js/app.js index cf86af4dd..d6da99a97 100644 --- a/assets/js/app.js +++ b/assets/js/app.js @@ -332,9 +332,13 @@ const main = Vue.component('main', { } }, methods: { - configured: function(val) { - if (val == '<<.Configured>>' && val != '0') { - return 0+val; + configured: function (val) { + // for development purposes + if (val == '<<.Configured>>') { + return true; + } + if (!isNaN(parseInt(val)) && parseInt(val) > 0) { + return true; } return false; } diff --git a/server/assets.go b/server/assets.go index 27bd647f5..0e72eb798 100644 --- a/server/assets.go +++ b/server/assets.go @@ -3651,53 +3651,54 @@ Lf8KdwPowg214Gi2bIB8ly3bT+3Lz00AO9CCMeMNCMPyfO4vOm4eN4W0JrQD//riCGDTt/Sqfmooz7u/ "/js/app.js": { name: "app.js", local: "../assets/js/app.js", - size: 8691, + size: 8796, modtime: 1566640112, compressed: ` -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 +l6X/BQAA//9E4YQ5XCIAAA== `, }, diff --git a/server/http.go b/server/http.go index b76e2dc9a..c1cfa9624 100644 --- a/server/http.go +++ b/server/http.go @@ -95,7 +95,7 @@ func indexHandler(links []MenuConfig, site site, liveAssets bool) http.HandlerFu "Commit": Commit, "Debug": debug, "Links": links, - "Configured": len(site.LoadPoints()) > 0, + "Configured": len(site.LoadPoints()), }); err != nil { log.ERROR.Println("httpd: failed to render main page: ", err.Error()) }