nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-config-mode-domain-select: first try to show hidden domain if configured

Browse Source
This commit is contained in:
kb-light 2018-02-05 20:09:16 +01:00
parent 64ad28617e
commit 32166f8176
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/gluon-config-mode-domain-select/luasrc/lib/gluon/config-mode/wizard/0200-domain-select.lua
View File

@ -1,6 +1,7 @@
return function(form, uci) return function(form, uci)
local fs = require 'nixio.fs' local fs = require 'nixio.fs'
local json = require 'jsonc' local json = require 'jsonc'
local site = require 'gluon.site'
local function get_domain_list() local function get_domain_list()
local list = {} local list = {}
@ -19,13 +20,15 @@ return function(form, uci)
local s = form:section(Section, nil, translate('gluon-config-mode:domain-select')) local s = form:section(Section, nil, translate('gluon-config-mode:domain-select'))
local o = s:option(ListValue, 'domain', translate('gluon-config-mode:domain')) 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 if configured then
o.default = uci:get('gluon', 'core', 'domain') o.default = domain_code
end end
for _, domain in pairs(get_domain_list()) do 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) o:value(domain.domain_code, domain.domain_name)
end end
end end