cotugno/zigbee2mqtt
2
Fork 0
mirror of https://github.com/Koenkk/zigbee2mqtt.git synced 2024-11-17 02:48:31 -07:00
Code Issues Packages Projects Releases Wiki Activity

Allow null values for serial.adapter. https://github.com/nurikk/z2m-frontend/issues/449

Browse Source
This commit is contained in:
Koen Kanters 2021-05-03 20:44:33 +02:00
parent 700e9c0c3a
commit a35faa9554
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util/settings.js
View File

@ -322,7 +322,7 @@ function applyEnvironmentVariables(settings) {
const iterate = (obj, path) => { const iterate = (obj, path) => {
Object.keys(obj).forEach((key) => { Object.keys(obj).forEach((key) => {
if (key !== 'type') { if (key !== 'type') {
if (key !== 'properties') { if (key !== 'properties' && obj[key]) {
const type = (obj[key].type || 'object').toString(); const type = (obj[key].type || 'object').toString();
const envPart = path.reduce((acc, val) => `${acc}${val}_`, ''); const envPart = path.reduce((acc, val) => `${acc}${val}_`, '');
const envVariableName = (`ZIGBEE2MQTT_CONFIG_${envPart}${key}`).toUpperCase(); const envVariableName = (`ZIGBEE2MQTT_CONFIG_${envPart}${key}`).toUpperCase();
@ -347,7 +347,7 @@ function applyEnvironmentVariables(settings) {
} }
} }
if (typeof obj[key] === 'object') { if (typeof obj[key] === 'object' && obj[key]) {
const newPath = [...path]; const newPath = [...path];
if (key !== 'properties') { if (key !== 'properties') {
newPath.push(key); newPath.push(key);

2
lib/util/settings.schema.json
View File

@ -144,7 +144,7 @@
}, },
"adapter": { "adapter": {
"type": ["string", "null"], "type": ["string", "null"],
"enum": ["deconz", "zstack", "zigate", "ezsp"], "enum": ["deconz", "zstack", "zigate", "ezsp", null],
"title": "Adapter", "title": "Adapter",
"requiresRestart": true, "requiresRestart": true,
"description": "Adapter type, not needed unless you are experiencing problems" "description": "Adapter type, not needed unless you are experiencing problems"