public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager 2/3] ui: bandwidth limit selector: make it possible to allow zero
Date: Mon, 15 Mar 2021 12:57:28 +0100	[thread overview]
Message-ID: <20210315115729.24381-2-f.ebner@proxmox.com> (raw)
In-Reply-To: <20210315115729.24381-1-f.ebner@proxmox.com>

The initial value is '' and in getSubmitValue(), previously the branch
   if (v == 0 || v == 0.0) return null;
was taken, because of the lax '==' comparision. Make sure we still return null
for '' by explicitly checking for it.

Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
 www/manager6/form/BandwidthSelector.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/www/manager6/form/BandwidthSelector.js b/www/manager6/form/BandwidthSelector.js
index 4ae52f9d..6f564fb8 100644
--- a/www/manager6/form/BandwidthSelector.js
+++ b/www/manager6/form/BandwidthSelector.js
@@ -36,12 +36,16 @@ Ext.define('PVE.form.BandwidthField', {
     // for KiB set it to 'KiB'
     backendUnit: undefined,
 
+    // allow setting 0 and using it as a submit value
+    allowZero: false,
+
     items: [
 	{
 	    xtype: 'numberfield',
 	    cbind: {
 		name: '{name}',
 		emptyText: '{emptyText}',
+		allowZero: '{allowZero}',
 	    },
 	    minValue: 0,
 	    step: 1,
@@ -61,7 +65,9 @@ Ext.define('PVE.form.BandwidthField', {
 		    this._transformed = true;
 		}
 
-		if (v == 0) v = undefined;
+		if (Number(v) === 0 && !this.allowZero) {
+		    v = undefined;
+		}
 
 		return Ext.form.field.Text.prototype.setValue.call(this, v);
 	    },
@@ -69,9 +75,13 @@ Ext.define('PVE.form.BandwidthField', {
 		let v = this.processRawValue(this.getRawValue());
 		v = v.replace(this.decimalSeparator, '.');
 
-		if (v === undefined) return null;
-		// FIXME: make it configurable, as this only works if 0 === default
-		if (v == 0 || v == 0.0) return null;
+		if (v === undefined || v === '') {
+		    return null;
+		}
+
+		if (Number(v) === 0) {
+		    return this.allowZero ? 0 : null;
+		}
 
 		let fieldct = this.up('pveBandwidthField');
 		let vm = fieldct.getViewModel();
-- 
2.20.1





  reply	other threads:[~2021-03-15 11:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-15 11:57 [pve-devel] [PATCH qemu-server 1/3] restore vma: fix applying storage-specific bandwidth limit Fabian Ebner
2021-03-15 11:57 ` Fabian Ebner [this message]
2021-03-15 11:57 ` [pve-devel] [PATCH manager 3/3] ui: restore: fix bandwidth limit behavior Fabian Ebner
2021-03-15 12:30 ` [pve-devel] applied-series: [PATCH qemu-server 1/3] restore vma: fix applying storage-specific bandwidth limit Thomas Lamprecht

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=20210315115729.24381-2-f.ebner@proxmox.com \
    --to=f.ebner@proxmox.com \
    --cc=pve-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