luci-0.10: merge r7924

diff --git a/modules/admin-full/luasrc/view/admin_uci/changelog.htm b/modules/admin-full/luasrc/view/admin_uci/changelog.htm
index 43f7bd1962538b0f77d60d7d0f018a7776739b9d..e195befb3e7375916774148c30a48b93c12cb54c 100644 (file)
--- 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