* [pbs-devel] [PATCH proxmox-backup 1/3] ui: indentation fix
@ 2021-11-22 8:09 Dominik Csapak
2021-11-22 8:09 ` [pbs-devel] [PATCH proxmox-backup 2/3] ui: traffic-control: fix sending network value Dominik Csapak
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dominik Csapak @ 2021-11-22 8:09 UTC (permalink / raw)
To: pbs-devel
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/window/TrafficControlEdit.js | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/www/window/TrafficControlEdit.js b/www/window/TrafficControlEdit.js
index 82d20cb8..53b15427 100644
--- a/www/window/TrafficControlEdit.js
+++ b/www/window/TrafficControlEdit.js
@@ -289,9 +289,8 @@ Ext.define('PBS.window.TrafficControlEdit', {
name: 'network',
emptyText: gettext('0.0.0.0/0 (Apply on all Networks)'),
autoEl: {
- tag: 'div',
- 'data-qtip': gettext('A comma-separated list of networks to apply the (shared) limit.'),
-
+ tag: 'div',
+ 'data-qtip': gettext('A comma-separated list of networks to apply the (shared) limit.'),
},
},
{
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 2/3] ui: traffic-control: fix sending network value
2021-11-22 8:09 [pbs-devel] [PATCH proxmox-backup 1/3] ui: indentation fix Dominik Csapak
@ 2021-11-22 8:09 ` Dominik Csapak
2021-11-22 8:09 ` [pbs-devel] [PATCH proxmox-backup 3/3] ui: traffic-control: include ipv6 in 'all' networks Dominik Csapak
2021-11-22 9:49 ` [pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: indentation fix Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Dominik Csapak @ 2021-11-22 8:09 UTC (permalink / raw)
To: pbs-devel
we forgot to correclty send the network value as we changed from
the radiogroup to a simple text field
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/window/TrafficControlEdit.js | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/www/window/TrafficControlEdit.js b/www/window/TrafficControlEdit.js
index 53b15427..69b01f7d 100644
--- a/www/window/TrafficControlEdit.js
+++ b/www/window/TrafficControlEdit.js
@@ -194,9 +194,9 @@ Ext.define('PBS.window.TrafficControlEdit', {
let me = this;
let isCreate = me.up('window').isCreate;
- if (!values['network-select']) {
+ if (!values.network) {
values.network = '0.0.0.0/0';
- } else if (values.network) {
+ } else {
values.network = values.network.split(/\s*,\s*/);
}
@@ -442,10 +442,7 @@ Ext.define('PBS.window.TrafficControlEdit', {
success: function(response) {
let data = response.result.data;
if (data.network?.length === 1 && data.network[0] === '0.0.0.0/0') {
- data['network-select'] = 'all';
delete data.network;
- } else {
- data['network-select'] = 'limit';
}
if (Ext.isArray(data.timeframe)) {
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] [PATCH proxmox-backup 3/3] ui: traffic-control: include ipv6 in 'all' networks
2021-11-22 8:09 [pbs-devel] [PATCH proxmox-backup 1/3] ui: indentation fix Dominik Csapak
2021-11-22 8:09 ` [pbs-devel] [PATCH proxmox-backup 2/3] ui: traffic-control: fix sending network value Dominik Csapak
@ 2021-11-22 8:09 ` Dominik Csapak
2021-11-22 9:49 ` [pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: indentation fix Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Dominik Csapak @ 2021-11-22 8:09 UTC (permalink / raw)
To: pbs-devel
by including '::/0' too
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
www/window/TrafficControlEdit.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/www/window/TrafficControlEdit.js b/www/window/TrafficControlEdit.js
index 69b01f7d..7d5d6899 100644
--- a/www/window/TrafficControlEdit.js
+++ b/www/window/TrafficControlEdit.js
@@ -195,7 +195,7 @@ Ext.define('PBS.window.TrafficControlEdit', {
let isCreate = me.up('window').isCreate;
if (!values.network) {
- values.network = '0.0.0.0/0';
+ values.network = ['0.0.0.0/0', '::/0'];
} else {
values.network = values.network.split(/\s*,\s*/);
}
@@ -287,7 +287,7 @@ Ext.define('PBS.window.TrafficControlEdit', {
xtype: 'proxmoxtextfield',
fieldLabel: gettext('Network(s)'),
name: 'network',
- emptyText: gettext('0.0.0.0/0 (Apply on all Networks)'),
+ emptyText: gettext('0.0.0.0/0, ::/0 (Apply on all Networks)'),
autoEl: {
tag: 'div',
'data-qtip': gettext('A comma-separated list of networks to apply the (shared) limit.'),
@@ -441,7 +441,7 @@ Ext.define('PBS.window.TrafficControlEdit', {
me.load({
success: function(response) {
let data = response.result.data;
- if (data.network?.length === 1 && data.network[0] === '0.0.0.0/0') {
+ if (data.network?.length === 2 && data.network[0] === '0.0.0.0/0' && data.network[1] === '::/0') {
delete data.network;
}
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: indentation fix
2021-11-22 8:09 [pbs-devel] [PATCH proxmox-backup 1/3] ui: indentation fix Dominik Csapak
2021-11-22 8:09 ` [pbs-devel] [PATCH proxmox-backup 2/3] ui: traffic-control: fix sending network value Dominik Csapak
2021-11-22 8:09 ` [pbs-devel] [PATCH proxmox-backup 3/3] ui: traffic-control: include ipv6 in 'all' networks Dominik Csapak
@ 2021-11-22 9:49 ` Thomas Lamprecht
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Lamprecht @ 2021-11-22 9:49 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Dominik Csapak
On 22.11.21 09:09, Dominik Csapak wrote:
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> www/window/TrafficControlEdit.js | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
>
applied all three patches, thanks!
There was still a useless left-over of "network-select" radio group, dropped that
in a follow up. Further, moved the CIDR's themself out of the gettext for the network
empty text and joined the networks with a comma _and_ a space for better readability.
Also, the networks now are filtered through a similar simple heuristic to avoid
duplicates.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-22 9:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-22 8:09 [pbs-devel] [PATCH proxmox-backup 1/3] ui: indentation fix Dominik Csapak
2021-11-22 8:09 ` [pbs-devel] [PATCH proxmox-backup 2/3] ui: traffic-control: fix sending network value Dominik Csapak
2021-11-22 8:09 ` [pbs-devel] [PATCH proxmox-backup 3/3] ui: traffic-control: include ipv6 in 'all' networks Dominik Csapak
2021-11-22 9:49 ` [pbs-devel] applied: [PATCH proxmox-backup 1/3] ui: indentation fix Thomas Lamprecht
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox