From aa2b9102c32f55cdf27e97dfcbaa5a44ff0814bd Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Wed, 9 Dec 2020 00:35:59 +0300 Subject: [PATCH] Fix parsing value for ip_whitelist setting --- src/store/modules/normalizers.js | 2 ++ src/views/settings/components/Inputs.vue | 1 + 2 files changed, 3 insertions(+) diff --git a/src/store/modules/normalizers.js b/src/store/modules/normalizers.js index ed0d04b8..150865d0 100644 --- a/src/store/modules/normalizers.js +++ b/src/store/modules/normalizers.js @@ -100,6 +100,8 @@ export const parseTuples = (tuples, key) => { accum[item.tuple[0]] = parseStringOrTupleValue(item.tuple[0], item.tuple[1]) } else if (item.tuple[0] === ':args') { accum[item.tuple[0]] = parseNonTuples(item.tuple[0], item.tuple[1]) + } else if (item.tuple[0] === ':ip_whitelist') { + accum[item.tuple[0]] = item.tuple[1].map(ip => typeof ip === 'string' ? ip : ip.tuple.join('.')) } else if (Array.isArray(item.tuple[1]) && (typeof item.tuple[1][0] === 'object' && !Array.isArray(item.tuple[1][0])) && item.tuple[1][0]['tuple']) { accum[item.tuple[0]] = parseTuples(item.tuple[1], item.tuple[0]) diff --git a/src/views/settings/components/Inputs.vue b/src/views/settings/components/Inputs.vue index 7ab8007c..e052fefd 100644 --- a/src/views/settings/components/Inputs.vue +++ b/src/views/settings/components/Inputs.vue @@ -363,6 +363,7 @@ export default { }, renderMultipleSelect(type) { return !this.reducedSelects && Array.isArray(type) && this.setting.key !== ':backends' && this.setting.key !== ':args' && ( + this.setting.key === ':ip_whitelist' || type.includes('module') || (type.includes('list') && type.includes('string')) || (type.includes('list') && type.includes('atom')) ||