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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D50C295B1F for ; Wed, 28 Feb 2024 11:01:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C09408D2B for ; Wed, 28 Feb 2024 11:01:18 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 28 Feb 2024 11:01:17 +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 C5C6847B8C for ; Wed, 28 Feb 2024 11:01:16 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Wed, 28 Feb 2024 11:00:52 +0100 Message-Id: <20240228100106.87262-5-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240228100106.87262-1-l.wagner@proxmox.com> References: <20240228100106.87262-1-l.wagner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.003 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 manager v4 04/18] ui: dc: backup: allow to set custom job id in advanced settings 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: Wed, 28 Feb 2024 10:01:48 -0000 This might be useful if somebody wants to match on the new 'backup-job' field in a notification match rule. Signed-off-by: Lukas Wagner --- www/manager6/Utils.js | 4 ++++ www/manager6/dc/Backup.js | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index a8d5786d..4c8bf9d3 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -1942,6 +1942,10 @@ Ext.define('PVE.Utils', { singleton: true, constructor: function() { var me = this; + + // Same regex as 'pve-configid + me.CONFIGID_RE = /^[A-Za-z][A-Za-z0-9_-]+$/; + Ext.apply(me, me.utilities); Proxmox.Utils.override_task_descriptions({ diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 4beb84c0..5b6f6688 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -397,6 +397,17 @@ Ext.define('PVE.dc.BackupEdit', { }, ], advancedColumn1: [ + { + xtype: 'pmxDisplayEditField', + fieldLabel: gettext('Job ID'), + emptyText: gettext('Autogenerate'), + name: 'id', + allowBlank: true, + regex: PVE.Utils.CONFIGID_RE, + cbind: { + editable: '{isCreate}', + }, + }, { xtype: 'proxmoxcheckbox', fieldLabel: gettext('Repeat missed'), -- 2.39.2