summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-base
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2020-08-31 14:12:54 +0200
committerGitHub <noreply@github.com>2020-08-31 14:12:54 +0200
commit4b8d4bac87629ae33e036ac089f3fc4976bfac71 (patch)
treec07a0e19b513d6f928d07e2b155a4016e194badf /modules/luci-base
parent21563a2d34342413c953f075576a2582ec238b7e (diff)
parent48715ba5c8ccec4bfe326b1de612d7056d161000 (diff)
Merge pull request #4239 from etactica/error404-messages
luci-base: dispatcher: error404: flow message into template
Diffstat (limited to 'modules/luci-base')
-rw-r--r--modules/luci-base/luasrc/dispatcher.lua2
-rw-r--r--modules/luci-base/luasrc/view/error404.htm1
2 files changed, 2 insertions, 1 deletions
diff --git a/modules/luci-base/luasrc/dispatcher.lua b/modules/luci-base/luasrc/dispatcher.lua
index 560140e3d..44c17c85f 100644
--- a/modules/luci-base/luasrc/dispatcher.lua
+++ b/modules/luci-base/luasrc/dispatcher.lua
@@ -395,7 +395,7 @@ function error404(message)
local function render()
local template = require "luci.template"
- template.render("error404")
+ template.render("error404", {message=message})
end
if not util.copcall(render) then
diff --git a/modules/luci-base/luasrc/view/error404.htm b/modules/luci-base/luasrc/view/error404.htm
index a762f6038..ff151d183 100644
--- a/modules/luci-base/luasrc/view/error404.htm
+++ b/modules/luci-base/luasrc/view/error404.htm
@@ -7,5 +7,6 @@
<%+header%>
<h2 name="content">404 <%:Not Found%></h2>
<p><%:Sorry, the object you requested was not found.%></p>
+<p><%=message%></p>
<tt><%:Unable to dispatch%>: <%=url(unpack(luci.dispatcher.context.request))%></tt>
<%+footer%>