Fixed agent invite when minify is enabled.
Ylian Saint-Hilaire committed
Sep 20, 2019 at 16:24 UTC
1b976f12e18953a1df5fbd01e824860ec05c6403
2 files changed
+10
-13
package.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"name": "meshcentral",
3
- "version": "0.4.1-a",
3
+ "version": "0.4.1-b",
4
"keywords": [
5
"Remote Management",
6
"Intel AMT",
webserver.js
+9
-12
@@ -3667,35 +3667,32 @@ module.exports.CreateWebServer = function (parent, db, args, certificates) {
3667
if (minify) {
3668
p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-mobile-min');
3669
if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Minify + Override document
3670
- } else {
3671
- p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-mobile');
3672
- if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Override document
3670
}
3671
+ p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-mobile');
3672
+ if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Override document
3673
}
3674
if (minify) {
3675
p = obj.path.join(obj.parent.webViewsPath, pagename + '-mobile-min');
3676
if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile + Minify document
3678
- } else {
3679
- p = obj.path.join(obj.parent.webViewsPath, pagename + '-mobile');
3680
- if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile document
3677
}
3678
+ p = obj.path.join(obj.parent.webViewsPath, pagename + '-mobile');
3679
+ if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Mobile document
3680
}
3681
if (obj.parent.webViewsOverridePath != null) {
3682
if (minify) {
3683
p = obj.path.join(obj.parent.webViewsOverridePath, pagename + '-min');
3684
if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Minify + Override document
3687
- } else {
3688
- p = obj.path.join(obj.parent.webViewsOverridePath, pagename);
3689
- if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Override document
3685
}
3686
+ p = obj.path.join(obj.parent.webViewsOverridePath, pagename);
3687
+ if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Override document
3688
}
3689
if (minify) {
3690
p = obj.path.join(obj.parent.webViewsPath, pagename + '-min');
3691
if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Minify document
3695
- } else {
3696
- p = obj.path.join(obj.parent.webViewsPath, pagename);
3697
- if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Default document
3692
}
3693
+ p = obj.path.join(obj.parent.webViewsPath, pagename);
3694
+ if (obj.fs.existsSync(p + '.handlebars')) { return p; } // Default document
3695
+ return null;
3696
}
3697
3698
// Return true if a mobile browser is detected.