From 346cb27e51e16a4ff3ac0fdca245c36ea0c0b41a Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 29 Jan 2020 00:54:45 +0800 Subject: [PATCH] luci-app-dockerman: sync with upstream source --- .../luasrc/model/cbi/docker/container.lua | 2 +- .../luasrc/model/cbi/docker/containers.lua | 4 +--- .../luci-app-dockerman/luasrc/model/cbi/docker/images.lua | 2 +- .../luci-app-dockerman/luasrc/model/cbi/docker/networks.lua | 2 +- .../luasrc/model/cbi/docker/newcontainer.lua | 2 +- .../luasrc/model/cbi/docker/newnetwork.lua | 2 +- .../luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua | 2 +- .../luci-app-dockerman/luasrc/view/docker/apply_widget.htm | 2 +- .../luasrc/view/docker/resolv_container.htm | 6 +++--- 9 files changed, 11 insertions(+), 13 deletions(-) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua index fc973c9117..d9df1e6891 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua @@ -123,7 +123,7 @@ docker_status = m:section(SimpleSection) docker_status.template="docker/apply_widget" docker_status.err=nixio.fs.readfile(dk.options.status_path) -- luci.util.perror(docker_status.err) -if docker_status then docker:clear_status() end +if docker_status.err then docker:clear_status() end action_section = m:section(Table,{{}}) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua index 4b70029b0d..6939f05d36 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua @@ -81,7 +81,7 @@ docker_status = m:section(SimpleSection) docker_status.template="docker/apply_widget" docker_status.err=nixio.fs.readfile(dk.options.status_path) -- luci.util.perror(docker_status.err) -if docker_status then docker:clear_status() end +if docker_status.err then docker:clear_status() end c_table = m:section(Table, c_lists, translate("Containers")) c_table.nodescr=true @@ -200,6 +200,4 @@ btnstop.write = function(self, section) start_stop_remove(m,"stop") end - - return m \ No newline at end of file diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua index a1be05c132..6cbb208589 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua @@ -151,7 +151,7 @@ end docker_status = m:section(SimpleSection) docker_status.template="docker/apply_widget" docker_status.err=nixio.fs.readfile(dk.options.status_path) -if docker_status then docker:clear_status() end +if docker_status.err then docker:clear_status() end action = m:section(Table,{{}}) action.notitle=true diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua index 4ca08f87c7..b1e924228e 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua @@ -75,7 +75,7 @@ end docker_status = m:section(SimpleSection) docker_status.template="docker/apply_widget" docker_status.err=nixio.fs.readfile(dk.options.status_path) -if docker_status then docker:clear_status() end +if docker_status.err then docker:clear_status() end action = m:section(Table,{{}}) action.notitle=true diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua index c3f468dc9f..ba040b4b74 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua @@ -157,7 +157,7 @@ m.redirect = luci.dispatcher.build_url("admin", "docker", "containers") docker_status = m:section(SimpleSection) docker_status.template="docker/apply_widget" docker_status.err=nixio.fs.readfile(dk.options.status_path) -if docker_status then docker:clear_status() end +if docker_status.err then docker:clear_status() end local s = m:section(SimpleSection, translate("New Container")) s.addremove = true diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua index 9345890778..7cd15dbc42 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua @@ -20,7 +20,7 @@ m.redirect = luci.dispatcher.build_url("admin", "docker", "networks") docker_status = m:section(SimpleSection) docker_status.template="docker/apply_widget" docker_status.err=nixio.fs.readfile(dk.options.status_path) -if docker_status then docker:clear_status() end +if docker_status.err then docker:clear_status() end s = m:section(SimpleSection, translate("New Network")) s.addremove = true diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua index 484706cc60..b75e830630 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua @@ -79,7 +79,7 @@ end docker_status = m:section(SimpleSection) docker_status.template="docker/apply_widget" docker_status.err=nixio.fs.readfile(dk.options.status_path) -if docker_status then docker:clear_status() end +if docker_status.err then docker:clear_status() end action = m:section(Table,{{}}) action.notitle=true diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm index 96f90b4c09..d43cbb2e3b 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm +++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm @@ -128,7 +128,7 @@ function fnSubmitForm(el){ } <% if self.err then -%> - docker_status_message('warning', "<%=self.err%>"); + docker_status_message('warning', `<%=self.err%>`); document.getElementById('docker_apply_overlay').addEventListener("click", (e)=>{ docker_status_message() }) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm index d6502d8246..c8db55874c 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm +++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm @@ -13,9 +13,9 @@ return; } let re = /\/admin\/docker\/newcontainer\// - let p = window.location.href - let path = p.split(re) - window.location = path[0] + "/admin/docker/newcontainer/" + encodeURI(cmd_line) + let p = window.location.href + let path = p.split(re) + window.location.href = path[0] + "/admin/docker/newcontainer/" + encodeURI(cmd_line) }