[pve-devel] applied: [PATCH widget-toolkit] certificates: don't display name if there is no name

Thomas Lamprecht t.lamprecht at proxmox.com
Thu Mar 7 15:40:49 CET 2024


Am 18/01/2024 um 15:14 schrieb Maximiliano Sandoval:
> The default certificate does not have a name.
> 
> Reported-by: Dietmar Maurer <dietmar at proxmox.com>
> Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
> ---
>  src/panel/Certificates.js | 14 ++++++++++----
>  1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/src/panel/Certificates.js b/src/panel/Certificates.js
> index a522ab6..f924512 100644
> --- a/src/panel/Certificates.js
> +++ b/src/panel/Certificates.js
> @@ -237,10 +237,16 @@ Ext.define('Proxmox.panel.Certificates', {
>  	    {
>  		xtype: 'proxmoxButton',
>  		text: gettext('Delete Custom Certificate'),
> -		confirmMsg: rec => Ext.String.format(
> -		    gettext('Are you sure you want to remove the certificate used for {0}'),
> -		    me.certById[rec.id].name,
> -		),
> +		confirmMsg: function(rec) {

could have kept the arrow fn style

> +		    let cert = me.certById[rec.id];
> +		    if (cert.name) {
> +			return Ext.String.format(
> +			    gettext('Are you sure you want to remove the certificate used for {0}'),
> +			    cert.name,
> +			);
> +		    }
> +		    return Ext.String.format(gettext('Are you sure you want to remove the certificate'));

wrapping a string without format variable in Ext.String.format is rather
useless, I amended the commit and dropped that.

applied, thanks!




More information about the pve-devel mailing list