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 D3FC571000 for ; Tue, 17 May 2022 11:47:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D1E4C2732F for ; Tue, 17 May 2022 11:47:05 +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 612CF27326 for ; Tue, 17 May 2022 11:47:05 +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 33D6D4367D for ; Tue, 17 May 2022 11:47:05 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 17 May 2022 11:47:04 +0200 Message-Id: <20220517094704.1879984-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.119 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup] ui: tape/Restore: fix form validation for datastore mapping 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, 17 May 2022 09:47:05 -0000 'defaultStore' can be '' or null, so check for truthyness also, we want the mapping to be a formField so that the validation triggers and the restore button gets en/disabled accordingly. We still have to call 'getValue' manually, because the onGetValues will get it as string instead of an array Signed-off-by: Dominik Csapak --- www/tape/window/TapeRestore.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/www/tape/window/TapeRestore.js b/www/tape/window/TapeRestore.js index 08010085..8a6f6c2f 100644 --- a/www/tape/window/TapeRestore.js +++ b/www/tape/window/TapeRestore.js @@ -383,6 +383,8 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', { let defaultNs = values.defaultNs; delete values.defaultNs; + // we have to get it manually but want it to be a form field + delete values.mapping; let [ds_map, ns_map] = me.down('pbsDataStoreMappingField').getValue(); if (ds_map !== '') { datastores.push(ds_map); @@ -474,7 +476,7 @@ Ext.define('PBS.TapeManagement.TapeRestoreWindow', { }, { xtype: 'pbsDataStoreMappingField', - isFormField: false, + name: 'mapping', reference: 'mappingGrid', height: 240, defaultBindProperty: 'value', @@ -565,7 +567,7 @@ Ext.define('PBS.TapeManagement.DataStoreMappingGrid', { let me = this; let error = false; - if (me.getViewModel().get('defaultStore') !== '') { + if (!me.getViewModel().get('defaultStore')) { error = true; me.getStore().each(rec => { if (rec.data.target) { -- 2.30.2