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 5CAEA9B41B for ; Mon, 20 Nov 2023 15:54:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3D4B21B808 for ; Mon, 20 Nov 2023 15:54:00 +0100 (CET) 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 ; Mon, 20 Nov 2023 15:53:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4CC9C434CD for ; Mon, 20 Nov 2023 15:53:59 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 20 Nov 2023 15:53:56 +0100 Message-Id: <20231120145356.184383-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.078 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 - Subject: [pve-devel] [PATCH widget-toolkit] notification matcher: fix inverted match modes 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: Mon, 20 Nov 2023 14:54:30 -0000 The 'not' prefix is already stripped in the set() method of the view model's 'rootMode' and not present anymore when updating the store. The information about whether the mode is inverted or not is present in the 'invert' data member. Signed-off-by: Fiona Ebner --- src/window/NotificationMatcherEdit.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/window/NotificationMatcherEdit.js b/src/window/NotificationMatcherEdit.js index 5a88288..ee08c16 100644 --- a/src/window/NotificationMatcherEdit.js +++ b/src/window/NotificationMatcherEdit.js @@ -778,12 +778,8 @@ Ext.define('Proxmox.panel.NotificationMatchRuleTree', { matchCalendarStmts.push(data.value); break; case 'mode': - if (data.value.startsWith('not')) { - modeStmt = data.value.substring(3); // after 'not'' - invertMatchStmt = true; - } else { - modeStmt = data.value; - } + modeStmt = data.value; + invertMatchStmt = data.invert; break; } -- 2.39.2