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 30965988C9 for ; Tue, 25 Apr 2023 16:00:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1538A3CCCE for ; Tue, 25 Apr 2023 15:59:58 +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 for ; Tue, 25 Apr 2023 15:59:56 +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 A7EA54547B for ; Tue, 25 Apr 2023 15:59:56 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 25 Apr 2023 15:59:56 +0200 Message-Id: <20230425135956.83518-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230425135956.83518-1-d.csapak@proxmox.com> References: <20230425135956.83518-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [values.store] Subject: [pbs-devel] [PATCH proxmox-backup 2/2] ui: tape: fix restoring a single datastore X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Apr 2023 14:00:28 -0000 if the user selected a single datastore to restore from tape on a media-set that includes more than one, the ui suggests (and is intended to) that only that datastore will be restored on the selected target. The logic to construct the store mapping parameter did not consider that case, and simply gave the target as default store, which meant all datastores were restored onto the target. To fix that, we have to get the source datastore from the field, and construct the correct parameter ("source=target"). Signed-off-by: Dominik Csapak --- www/tape/window/TapeRestore.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/www/tape/window/TapeRestore.js b/www/tape/window/TapeRestore.js index 48119ac6..2ff7c4dd 100644 --- a/www/tape/window/TapeRestore.js +++ b/www/tape/window/TapeRestore.js @@ -375,9 +375,15 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', { onGetValues: function(values) { let me = this; let controller = me.up('window').getController(); + let vm = controller.getViewModel(); let datastores = []; if (values.store.toString() !== "") { - datastores.push(values.store); + if (vm.get('singleDatastore')) { + let source = controller.lookup('snapshotGrid').getValue(); + datastores.push(`${source}=${values.store}`); + } else { + datastores.push(values.store); + } delete values.store; } -- 2.30.2