From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id A76B31FF0C0 for ; Wed, 04 Nov 2026 15:54:33 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 154F9213F4; Wed, 04 Nov 2026 15:54:33 +0100 (CET) From: Jonas Theisen To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox-backup v5 4/9] ui: prune job: align prune edit window to other "Enable" checkboxes Date: Wed, 4 Nov 2026 15:53:30 +0100 Message-ID: <20261104145405.441861-5-j.theisen@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261104145405.441861-1-j.theisen@proxmox.com> References: <20261104145405.441861-1-j.theisen@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1793804067610 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.103 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: UZLOIHCMRJYKLGMEV6J3AL2K34KU2SUE X-Message-ID-Hash: UZLOIHCMRJYKLGMEV6J3AL2K34KU2SUE X-MailFrom: j.theisen@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Align the already existing "Enabled" checkbox in the prune job edit window to the "Enable" checkboxes of the other job types: rename it to "Enable", as is more common throughout the UI, add the same tooltip, and disable the schedule field while the checkbox is unchecked. Signed-off-by: Jonas Theisen --- www/Utils.js | 15 +++++++++++++ www/window/PruneJobEdit.js | 44 ++++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/www/Utils.js b/www/Utils.js index d6bfd459e..f4a27c13b 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -127,6 +127,21 @@ Ext.define('PBS.Utils', { } }, + // jobs are disabled via a 'disable' flag in the API, but the UI shows an "Enable" checkbox + enableToDisable: function (values, prefix = '') { + values[`${prefix}disable`] = !values[`${prefix}enable`]; + delete values[`${prefix}enable`]; + + return values; + }, + + disableToEnable: function (values, prefix = '') { + values[`${prefix}enable`] = !values[`${prefix}disable`]; + delete values[`${prefix}disable`]; + + return values; + }, + render_datetime_utc: function (datetime) { let pad = (number) => (number < 10 ? '0' + number : number); return ( diff --git a/www/window/PruneJobEdit.js b/www/window/PruneJobEdit.js index a3dafde21..9f6c972ec 100644 --- a/www/window/PruneJobEdit.js +++ b/www/window/PruneJobEdit.js @@ -43,6 +43,21 @@ Ext.define('PBS.window.PruneJobEdit', { }, }, + viewModel: { + data: { + jobEnabled: true, + }, + }, + + setValues: function (values) { + let me = this; + + if (!values.schedule) { + values.disable = true; + } + me.callParent([values]); + }, + items: { xtype: 'inputpanel', onGetValues: function (values) { @@ -51,18 +66,10 @@ Ext.define('PBS.window.PruneJobEdit', { if (!values.id && me.up('pbsPruneJobEdit').isCreate) { values.id = 's-' + Ext.data.identifier.Uuid.Global.generate().slice(0, 13); } - values.disable = !values.enable; - delete values.enable; - - return values; - }, - onSetValues: function (values) { - let _me = this; - values.enable = !values.disable; - delete values.disable; - return values; + return PBS.Utils.enableToDisable(values); }, + onSetValues: (values) => PBS.Utils.disableToEnable(values), column1: [ { xtype: 'pmxDisplayEditField', @@ -115,14 +122,23 @@ Ext.define('PBS.window.PruneJobEdit', { cbind: { value: '{scheduleValue}', }, + bind: { + disabled: '{!jobEnabled}', + }, }, { xtype: 'proxmoxcheckbox', - fieldLabel: gettext('Enabled'), + fieldLabel: gettext('Enable'), name: 'enable', - uncheckedValue: 0, - defaultValue: 1, - checked: true, + autoEl: { + tag: 'div', + 'data-qtip': gettext('Enable scheduled execution of this job.'), + }, + bind: { + value: '{jobEnabled}', + }, + uncheckedValue: false, + value: true, // value needs to be set despite bind for setValues to work }, ], -- 2.47.3