From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Mon, 19 Oct 2020 15:00:36 +0000 (+0300)
Subject: luci-app-dockerman: set fallback default of rollback to 90s
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2bbde8568a079b90d25f8155c48cf4eac7929fb9;p=project%2Fluci.git

luci-app-dockerman: set fallback default of rollback to 90s

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>
---

diff --git a/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm b/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm
index 189055c20b..59a3da9db2 100644
--- a/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm
+++ b/applications/luci-app-dockerman/luasrc/view/dockerman/apply_widget.htm
@@ -44,7 +44,7 @@
 
 <script type="text/javascript">//<![CDATA[
 	var xhr = new XHR(),
-	uci_apply_rollback = <%=math.max(luci.config and luci.config.apply and luci.config.apply.rollback or 30, 30)%>,
+	uci_apply_rollback = <%=math.max(luci.config and luci.config.apply and luci.config.apply.rollback or 90, 90)%>,
 	uci_apply_holdoff = <%=math.max(luci.config and luci.config.apply and luci.config.apply.holdoff or 4, 1)%>,
 	uci_apply_timeout = <%=math.max(luci.config and luci.config.apply and luci.config.apply.timeout or 5, 1)%>,
 	uci_apply_display = <%=math.max(luci.config and luci.config.apply and luci.config.apply.display or 1.5, 1)%>,