From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CBCAD712AC for ; Thu, 10 Jun 2021 09:37:20 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BEF532B9E7 for ; Thu, 10 Jun 2021 09:37:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3D2BE2B9DE for ; Thu, 10 Jun 2021 09:37:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id DC45742B97 for ; Thu, 10 Jun 2021 09:37:19 +0200 (CEST) From: Dominik Csapak To: pve-devel@lists.proxmox.com Date: Thu, 10 Jun 2021 09:37:19 +0200 Message-Id: <20210610073719.26504-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.953 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [me.storage] Subject: [pve-devel] [PATCH manager] ui: file-restore: start the file-restore on the selected node X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jun 2021 07:37:20 -0000 and not the node where the browser connects. there are at least two good reasons for this: * it is confusing, since the user would expect it to start where the ui is pointint to * the storage may not be available on the node the browser connects to, but it must be available on the node selected in the ui Signed-off-by: Dominik Csapak --- www/manager6/grid/BackupView.js | 4 ++-- www/manager6/storage/BackupView.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js index 8825ed96..fbed4118 100644 --- a/www/manager6/grid/BackupView.js +++ b/www/manager6/grid/BackupView.js @@ -247,8 +247,8 @@ Ext.define('PVE.grid.BackupView', { let isVMArchive = PVE.Utils.volume_is_qemu_backup(rec.data.volid, rec.data.format); Ext.create('Proxmox.window.FileBrowser', { title: gettext('File Restore') + " - " + rec.data.text, - listURL: `/api2/json/nodes/localhost/storage/${storage}/file-restore/list`, - downloadURL: `/api2/json/nodes/localhost/storage/${storage}/file-restore/download`, + listURL: `/api2/json/nodes/${nodename}/storage/${storage}/file-restore/list`, + downloadURL: `/api2/json/nodes/${nodename}/storage/${storage}/file-restore/download`, extraParams: { volume: rec.data.volid, }, diff --git a/www/manager6/storage/BackupView.js b/www/manager6/storage/BackupView.js index 0613c94d..c287ec63 100644 --- a/www/manager6/storage/BackupView.js +++ b/www/manager6/storage/BackupView.js @@ -114,8 +114,8 @@ Ext.define('PVE.storage.BackupView', { let isVMArchive = PVE.Utils.volume_is_qemu_backup(rec.data.volid, rec.data.format); Ext.create('Proxmox.window.FileBrowser', { title: gettext('File Restore') + " - " + rec.data.text, - listURL: `/api2/json/nodes/localhost/storage/${me.storage}/file-restore/list`, - downloadURL: `/api2/json/nodes/localhost/storage/${me.storage}/file-restore/download`, + listURL: `/api2/json/nodes/${nodename}/storage/${me.storage}/file-restore/list`, + downloadURL: `/api2/json/nodes/${nodename}/storage/${me.storage}/file-restore/download`, extraParams: { volume: rec.data.volid, }, -- 2.20.1