openwrt/luci
1
0
Fork 0
mirror of https://github.com/openwrt/luci.git synced 2026-04-15 19:01:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

luci-app-attendedsysupgrade: supply proper version to package changes

Browse Source 
Fix bug in applyPackageChanges, it was using the installed version as the
target, resulting in no changes being applied.

Signed-off-by: Eric Fahlgren <ericfahlgren@gmail.com>
This commit is contained in:
Eric Fahlgren
2025-02-08 06:10:05 -08:00
committed by Hannu Nyman
parent 5a79a578aa
commit 2e9ffc6628
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
applications/luci-app-attendedsysupgrade/htdocs/luci-static/resources/view/attendedsysupgrade/overview.js
View File

@@ -78,9 +78,11 @@ return view.extend({
request_hash: '',
sha256_unsigned: '',
applyPackageChanges: async function(packages, data, firmware) {
const overview_url = `${data.url}/api/v1/overview`;
const revision_url = `${data.url}/api/v1/revision/${firmware.version}/${firmware.target}`;
applyPackageChanges: async function(package_info) {
let { url, target, version, packages } = package_info;
const overview_url = `${url}/api/v1/overview`;
const revision_url = `${url}/api/v1/revision/${version}/${target}`;
let changes, target_revision;
@@ -88,7 +90,7 @@ return view.extend({
request.get(overview_url).then(
(response) => {
let json = response.json();
changes = json.branches[get_branch(firmware.version)].package_changes;
changes = json.branches[get_branch(version)].package_changes;
},
(failed) => {
ui.addNotification(null, E('p', _(`Get overview failed ${failed}`)));
@@ -581,7 +583,12 @@ return view.extend({
class: 'btn cbi-button cbi-button-positive important',
click: ui.createHandlerFn(this, function () {
map.save().then(() => {
this.applyPackageChanges(mapdata.request.packages, data, firmware).then((packages) => {
this.applyPackageChanges({
url,
target,
version: mapdata.request.version,
packages: mapdata.request.packages,
}).then((packages) => {
const content = {
...firmware,
packages: packages,