From 64ad28617e56bf15b5a4fcaea6286bd28155fadc Mon Sep 17 00:00:00 2001 From: kb-light Date: Sun, 4 Feb 2018 21:31:33 +0100 Subject: [PATCH] gluon-config-mode-domain-select: apply changes mentioned by neoraider --- .../lib/gluon/config-mode/wizard/0200-domain-select.lua | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua b/package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua index 71fbd185..4502b4ac 100644 --- a/package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua +++ b/package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua @@ -1,17 +1,15 @@ return function(form, uci) - local site = require 'gluon.site' - local path = '/lib/gluon/domains' local fs = require 'nixio.fs' local json = require 'jsonc' local function get_domain_list() local list = {} - for domain_path in fs.glob(path .. '/*.json') do - local domain_code = domain_path:match(path .. '/(.*)%.json$') + for domain_path in fs.glob('/lib/gluon/domains/*.json') do + local domain_code = domain_path:match('([^/]+)%.json$') local domain = assert(json.load(domain_path)) table.insert(list, { domain_code = domain_code, - domain_name = (domain.domain_names or {})[domain_code], + domain_name = domain.domain_names[domain_code], hide_domain = domain.hide_domain or False, }) end