From: Jo-Philipp Wich <redacted>
Date: Thu, 5 May 2022 21:31:21 +0000 (+0200)
Subject: luci-base: ui.js: gracefully handle failing confirm calls on rollback
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=b6797821b86678d8dd604ce4805691784e6dc3ce;p=openwrt-luci.git

luci-base: ui.js: gracefully handle failing confirm calls on rollback

Do not abort the poll loop if some confirm request attempts fail, which
might happen when the device starts rolling back its configuration.

Before that fix, the rollback information dialog offering an unchecked
apply was not reliably presented in such situations.

Signed-off-by: Jo-Philipp Wich <redacted>
---

diff --git a/modules/luci-base/htdocs/luci-static/resources/ui.js b/modules/luci-base/htdocs/luci-static/resources/ui.js
index b8763ef160..52f155b90e 100644
--- a/modules/luci-base/htdocs/luci-static/resources/ui.js
+++ b/modules/luci-base/htdocs/luci-static/resources/ui.js
@@ -4508,7 +4508,7 @@ var UI = baseclass.extend(/** @lends LuCI.ui.prototype */ {
 							method: 'post',
 							timeout: L.env.apply_timeout * 1000,
 							query: { sid: L.env.sessionid, token: L.env.token }
-						}).then(call);
+						}).then(call, call.bind(null, { status: 0 }, null, 0));
 					}, delay);
 				};