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 6C2C772E21 for ; Wed, 26 May 2021 15:48:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 631FF12ECC for ; Wed, 26 May 2021 15:48:14 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id AF11412E9A for ; Wed, 26 May 2021 15:48:12 +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 84965419D4 for ; Wed, 26 May 2021 15:48:12 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 26 May 2021 15:48:10 +0200 Message-Id: <20210526134811.333-9-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210526134811.333-1-d.csapak@proxmox.com> References: <20210526134811.333-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 Adjusted score from AWL reputation of From: address 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 Subject: [pbs-devel] [PATCH proxmox-backup 8/9] ui: tape/TapeRestore: allow preselecting a 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: Wed, 26 May 2021 13:48:14 -0000 for that we need to split the prefilter additions, else we always filter the snaphots too and giving 'undefined' filters all snapshots... Signed-off-by: Dominik Csapak --- www/tape/BackupOverview.js | 5 +++++ www/tape/window/TapeRestore.js | 33 ++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/www/tape/BackupOverview.js b/www/tape/BackupOverview.js index e8273f86..690836c3 100644 --- a/www/tape/BackupOverview.js +++ b/www/tape/BackupOverview.js @@ -161,6 +161,11 @@ Ext.define('PBS.TapeManagement.BackupOverview', { text: store, 'media-set-uuid': entry['media-set-uuid'], iconCls: 'fa fa-database', + restore: true, + 'media-set': media_set, + prefilter: { + store, + }, tapes: {}, }; } diff --git a/www/tape/window/TapeRestore.js b/www/tape/window/TapeRestore.js index 35619957..bc513632 100644 --- a/www/tape/window/TapeRestore.js +++ b/www/tape/window/TapeRestore.js @@ -732,19 +732,26 @@ Ext.define('PBS.TapeManagement.SnapshotGrid', { let me = this; me.callParent(); if (me.prefilter !== undefined) { - me.store.filters.add( - { - id: 'x-gridfilter-store', - property: 'store', - operator: 'in', - value: [me.prefilter.store], - }, - { - id: 'x-gridfilter-snapshot', - property: 'snapshot', - value: me.prefilter.snapshot, - }, - ); + if (me.prefilter.store !== undefined) { + me.store.filters.add( + { + id: 'x-gridfilter-store', + property: 'store', + operator: 'in', + value: [me.prefilter.store], + }, + ); + } + + if (me.prefilter.snapshot !== undefined) { + me.store.filters.add( + { + id: 'x-gridfilter-snapshot', + property: 'snapshot', + value: me.prefilter.snapshot, + }, + ); + } } me.mon(me.store, 'filterchange', () => me.checkChange()); -- 2.20.1