diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-12 14:31:31 +0000 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-11-12 14:31:31 +0000 |
commit | 52f6514541d6d6efa32b4eaf75f97a9d61b76db2 (patch) | |
tree | b84b1a8d683a3c6ebda7178edaca3fa0beab4077 /modules | |
parent | cfe48c17d339d6749b25d060d2cf2b980572f2da (diff) |
modules/admin-full: prepare uci changelog template for revised libuci-lua changelog format to properly expose add_list operations
Diffstat (limited to 'modules')
-rw-r--r-- | modules/admin-full/luasrc/view/admin_uci/changelog.htm | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/modules/admin-full/luasrc/view/admin_uci/changelog.htm b/modules/admin-full/luasrc/view/admin_uci/changelog.htm index 43f7bd196..e195befb3 100644 --- a/modules/admin-full/luasrc/view/admin_uci/changelog.htm +++ b/modules/admin-full/luasrc/view/admin_uci/changelog.htm @@ -35,7 +35,16 @@ $Id$ ret[#ret+1] = "<ins>%s.%s=<strong>%s</strong>" %{ r, s, os['.type'] } for o, v in util.kspairs(os) do if o:sub(1,1) ~= "." then - ret[#ret+1] = "<br />%s.%s.%s=<strong>%s</strong>" %{ r, s, o, util.pcdata(v) } + if type(v) == "table" then + local i + for i = 1, #v do + ret[#ret+1] = "<br />%s.%s.%s+=<strong>%s</strong>" + %{ r, s, o, util.pcdata(v[i]) } + end + else + ret[#ret+1] = "<br />%s.%s.%s=<strong>%s</strong>" + %{ r, s, o, util.pcdata(v) } + end end end ret[#ret+1] = "</ins><br />" @@ -49,8 +58,20 @@ $Id$ ret[#ret+1] = "<var>%s.%s<br />" %{ r, s } for o, v in util.kspairs(os) do if o:sub(1,1) ~= "." then - if v and v ~= "" then - ret[#ret+1] = "<ins>%s.%s.%s=<strong>%s</strong><br /></ins>" %{ r, s, o, util.pcdata(v) } + if v and #v > 0 then + ret[#ret+1] = "<ins>" + if type(v) == "table" then + local i + for i = 1, #v do + ret[#ret+1] = "%s.%s.%s+=<strong>%s</strong><br />" + %{ r, s, o, util.pcdata(v[i]) } + end + + else + ret[#ret+1] = "%s.%s.%s=<strong>%s</strong><br />" + %{ r, s, o, util.pcdata(v) } + end + ret[#ret+1] = "</ins>" else ret[#ret+1] = "<del>%s.%s.<strong>%s</strong><br /></del>" %{ r, s, o } end |