From 32166f81764f2044c2f2d5151344c1d73cf0af8f Mon Sep 17 00:00:00 2001 From: kb-light Date: Mon, 5 Feb 2018 20:09:16 +0100 Subject: [PATCH] gluon-config-mode-domain-select: first try to show hidden domain if configured --- .../lib/gluon/config-mode/wizard/0200-domain-select.lua | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 4502b4ac..6e5d8d89 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,6 +1,7 @@ return function(form, uci) local fs = require 'nixio.fs' local json = require 'jsonc' + local site = require 'gluon.site' local function get_domain_list() local list = {} @@ -19,13 +20,15 @@ return function(form, uci) local s = form:section(Section, nil, translate('gluon-config-mode:domain-select')) local o = s:option(ListValue, 'domain', translate('gluon-config-mode:domain')) + local domain_code = uci:get('gluon', 'core', 'domain') + local configured = uci:get_bool('gluon-setup-mode', uci:get_first('gluon-setup-mode','setup_mode'), 'configured') or (domain_code ~= site.default_domain()) - if uci:get_bool('gluon-setup-mode', uci:get_first('gluon-setup-mode','setup_mode'), 'configured') then - o.default = uci:get('gluon', 'core', 'domain') + if configured then + o.default = domain_code end for _, domain in pairs(get_domain_list()) do - if not domain.hide_domain then + if not domain.hide_domain or (configured and domain.domain_code == domain_code) then o:value(domain.domain_code, domain.domain_name) end end