[pve-devel] applied-series: [PATCH pve-manager v2 1/2] fix #4963: firewall: fix editing firewall rules using ips / cidrs

[Fabian Grünbichler]

with T-B/R-B as provided, thanks!

On January 16, 2024 3:30 pm, Stefan Hanreich wrote:
> fall back to using v.ref as value when we do not have an alias or ipset
> since scope and name are not set for ips / cidrs
> 
> Signed-off-by: Stefan Hanreich <s.hanreich at proxmox.com>
> ---
> 
> Changes from v1:
> * Added fix for an additional bug causing changes to IPs not being
>   picked up by the input panel
> 
>  www/manager6/form/IPRefSelector.js | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js
> index b50ac1e10..7e5eea63a 100644
> --- a/www/manager6/form/IPRefSelector.js
> +++ b/www/manager6/form/IPRefSelector.js
> @@ -37,8 +37,10 @@ Ext.define('PVE.form.IPRefSelector', {
>  		    calculate: function(v) {
>  			if (v.type === 'alias') {
>  			    return `${v.scope}/${v.name}`;
> -			} else {
> +			} else if (v.type === 'ipset') {
>  			    return `+${v.scope}/${v.name}`;
> +			} else {
> +			    return v.ref;
>  			}
>  		    },
>  		},
> -- 
> 2.39.2
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
>