summaryrefslogtreecommitdiffstats
path: root/server/api/configloader.js
diff options
context:
space:
mode:
authorChristian Hofmaier2019-02-25 21:16:40 +0100
committerChristian Hofmaier2019-02-25 21:16:40 +0100
commit81828d214b26e2d0803442fef3d435593650a6a4 (patch)
tree4f8e30fc78df6caf76822c943922c33e858a41b5 /server/api/configloader.js
parent[webapp] eslint fixes (diff)
downloadbas-81828d214b26e2d0803442fef3d435593650a6a4.tar.gz
bas-81828d214b26e2d0803442fef3d435593650a6a4.tar.xz
bas-81828d214b26e2d0803442fef3d435593650a6a4.zip
[configloader] fix non-expert-mode not loading correctly
Diffstat (limited to 'server/api/configloader.js')
-rw-r--r--server/api/configloader.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/api/configloader.js b/server/api/configloader.js
index bd231a5..2422693 100644
--- a/server/api/configloader.js
+++ b/server/api/configloader.js
@@ -108,7 +108,7 @@ function checkGroupsForConfigs (groupIds) {
// create the config script from database
function createIpxeScript (id) {
return db.config.findOne({ where: { id: id }, include: ['entries'], order: [[['entries'], 'sortValue', 'ASC']] }).then(config => {
- if (config.script !== null) {
+ if (config.script !== null && config.script !== '') {
return config.script
}
var script = ''
@@ -122,7 +122,7 @@ function createIpxeScript (id) {
script += ' --key ' + entry.config_x_entry.keyBind
}
script += ' menuentry' + entry.id + ' '
- if (entry.config_x_entry.customName !== null) {
+ if (entry.config_x_entry.customName !== null && entry.config_x_entry.customName !== '') {
script += entry.config_x_entry.customName
} else {
script += entry.name