From f9bc5da3650ed0044a80ddba91a601836e505484 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sun, 15 Aug 2021 18:50:49 -1000 Subject: [PATCH] luci-app-attendedsysupgrade: show position in queue The server provides a queue_position argument, show it. Signed-off-by: Paul Spooren (cherry picked from commit 53ff7ca676d10fa253d3ab472b9b5645996527ed) --- .../resources/view/attendedsysupgrade/overview.js | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js index 802868ad0d..5d5d4bd9ba 100644 --- a/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js +++ b/applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js @@ -170,14 +170,12 @@ function request_sysupgrade(server_url, data) { case 202: res = response.json() data.request_hash = res.request_hash; - switch (res.status) { - case "queued": - displayStatus("notice spinning", E('p', _('Request in build queue'))); - break; - case "started": - displayStatus("notice spinning", E('p', _('Building the sysupgrade image'))); - break; - } + + if ("queue_position" in res) + displayStatus("notice spinning", E('p', _('Request in build queue position %d'.format(res.queue_position)))); + else + displayStatus("notice spinning", E('p', _('Building firmware sysupgrade image'))); + setTimeout(function() { request_sysupgrade(server_url, data); }, 5000); -- 2.30.2