b0fe11ffc4
Set the fallback value of the config change rollback timeout
to 90 seconds to match the change in /etc/config/luci by commit
81cf99a50.
That commit changed the value in the config file, but did
not change the underlying fallback values that do get applied
when there is no proper config item in etc/config/luci.
Users sysupgrading from old systems may have carried an ancient
/etc/config/luci (without rollback config) with them, so this
change should help them to see the intended user experience.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
38 lines
1.5 KiB
HTML
38 lines
1.5 KiB
HTML
<%#
|
|
Copyright 2008 Steven Barth <steven@midlink.org>
|
|
Copyright 2008-2019 Jo-Philipp Wich <jo@mein.io>
|
|
Licensed to the public under the Apache License 2.0.
|
|
-%>
|
|
|
|
<%
|
|
if not luci.dispatcher.context.template_header_sent then
|
|
include("themes/" .. theme .. "/header")
|
|
luci.dispatcher.context.template_header_sent = true
|
|
end
|
|
|
|
local applyconf = luci.config and luci.config.apply
|
|
%>
|
|
|
|
<script type="text/javascript" src="<%=resource%>/promis.min.js"></script>
|
|
<script type="text/javascript" src="<%=resource%>/luci.js"></script>
|
|
<script type="text/javascript">
|
|
L = new LuCI(<%= luci.http.write_json({
|
|
token = token,
|
|
media = media,
|
|
resource = resource,
|
|
scriptname = luci.http.getenv("SCRIPT_NAME"),
|
|
pathinfo = luci.http.getenv("PATH_INFO"),
|
|
documentroot = luci.http.getenv("DOCUMENT_ROOT"),
|
|
requestpath = luci.dispatcher.context.requestpath,
|
|
dispatchpath = luci.dispatcher.context.path,
|
|
pollinterval = luci.config.main.pollinterval or 5,
|
|
ubuspath = luci.config.main.ubuspath or '/ubus/',
|
|
sessionid = luci.dispatcher.context.authsession,
|
|
nodespec = luci.dispatcher.context.dispatched,
|
|
apply_rollback = math.max(applyconf and applyconf.rollback or 90, 90),
|
|
apply_holdoff = math.max(applyconf and applyconf.holdoff or 4, 1),
|
|
apply_timeout = math.max(applyconf and applyconf.timeout or 5, 1),
|
|
apply_display = math.max(applyconf and applyconf.display or 1.5, 1),
|
|
rollback_token = rollback_token
|
|
}) %>);
|
|
</script>
|