summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-attendedsysupgrade/root
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2019-02-03 11:45:51 +0200
committerGitHub <noreply@github.com>2019-02-03 11:45:51 +0200
commit9f520b48d8380b4aa7473dd3bd240d51092c2cb2 (patch)
treee10e6de6c71960a20cd395b21223d0fbccf426b7 /applications/luci-app-attendedsysupgrade/root
parent8ea0f156abc036812326fa58e27f0c07be7f2105 (diff)
parentb7954cbdc6377742ba5083f7d9615ef194168365 (diff)
Merge pull request #2505 from aparcar/master
luci-app-attendedsysupgrade: fixup server url
Diffstat (limited to 'applications/luci-app-attendedsysupgrade/root')
-rw-r--r--applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js15
1 files changed, 6 insertions, 9 deletions
diff --git a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js
index 290fad1583..b5828a50fb 100644
--- a/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js
+++ b/applications/luci-app-attendedsysupgrade/root/www/luci-static/resources/attendedsysupgrade.js
@@ -5,7 +5,7 @@ function show(s) { $(s).style.display = 'block'; }
function hide(s) { $(s).style.display = 'none'; }
function set_server() {
- hide("#error_box");
+ hide("#status_box");
data.url = $("#server").value;
ubus_call("uci", "set", { "config": "attendedsysupgrade", "section": "server", values: { "url": data.url } })
ubus_call("uci", "commit", { "config": "attendedsysupgrade" })
@@ -142,12 +142,12 @@ function set_status(type, message, loading) {
function upgrade_check() {
// Asks server for new firmware
// If data.upgrade_packages is set to true search for new package versions as well
- hide("#error_box");
+ hide("#status_box");
hide("#server_div");
set_status("info", "Searching for upgrades", true);
var request_dict = {}
request_dict.version = data.release.version;
- request_dict.revision= data.release.revision;
+ request_dict.revision = data.release.revision;
request_dict.installed = data.packages;
request_dict.upgrade_packages = data.upgrade_packages
server_request(request_dict, "api/upgrade-check", upgrade_check_callback)
@@ -215,12 +215,10 @@ function upgrade_request_callback(request) {
data.sysupgrade_url = request_json.sysupgrade;
var filename_split = data.sysupgrade_url.split("/")
- data.filename = filename_split[filename_split.length - 1]
+ var filename = filename_split[filename_split.length - 1]
- var info_output = 'Firmware created: <a href="' + data.sysupgrade_url + '"><b>' + data.filename + '</b></a>'
- if(data.advanced_mode == 1) {
- info_output += '<br /><a target="_blank" href="' + data.sysupgrade_url + '.log">Build log</a>'
- }
+ var info_output = 'Firmware created: <a href="' + data.url + data.sysupgrade_url + '"><b>' + filename + '</b></a>'
+ info_output += ' <a target="_blank" href="' + data.url + request_json.log + '">Build log</a>'
set_status("info", info_output);
show("#keep_container");
@@ -374,7 +372,6 @@ function server_request(request_dict, path, callback) {
} else if (request.status === 501) {
set_status("danger", "No sysupgrade file produced, may not supported by model.")
-
} else if (request.status === 502) {
// python part offline
set_status("danger", "Server down for maintenance")