public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Jonas Theisen <j.theisen@proxmox.com>
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	[thread overview]
Message-ID: <20261104145405.441861-5-j.theisen@proxmox.com> (raw)
In-Reply-To: <20261104145405.441861-1-j.theisen@proxmox.com>

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 <j.theisen@proxmox.com>
---
 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





  parent reply	other threads:[~2026-11-04 14:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-04 14:53 [PATCH proxmox{,-backup} v5 0/9] fix #7904: Implement Enable checkboxes for all jobs Jonas Theisen
2026-11-04 14:53 ` [PATCH proxmox v5 1/9] pbs-api-types: add 'disable' to {sync,verify,tape,gc} job schema and datastore config Jonas Theisen
2026-11-04 14:53 ` [PATCH proxmox v5 2/9] pbs-api-types: prune job: make schedule optional Jonas Theisen
2026-11-04 14:53 ` [PATCH proxmox-backup v5 3/9] server: schedules: add 'disable' parameter to compute_schedule_status() Jonas Theisen
2026-11-04 14:53 ` Jonas Theisen [this message]
2026-11-04 14:53 ` [PATCH proxmox-backup v5 5/9] api: prune job: align prune job schedule to other jobs Jonas Theisen
2026-11-04 14:53 ` [PATCH proxmox-backup v5 6/9] fix #7904: api: implement "disable" for {sync,verify,tape,GC} jobs Jonas Theisen
2026-11-04 14:53 ` [PATCH proxmox-backup v5 7/9] fix #7904: ui: add "Enable" checkbox to {sync,verify,tape,GC} job edit Jonas Theisen
2026-11-04 14:53 ` [PATCH proxmox-backup v5 8/9] ui: job overview: show "Disabled" as schedule of disabled jobs Jonas Theisen
2026-11-04 14:53 ` [PATCH proxmox-backup v5 9/9] ui: calendar-event: hide clear button if a schedule is required Jonas Theisen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261104145405.441861-5-j.theisen@proxmox.com \
    --to=j.theisen@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal