ui: guest remove: modernize code and cleanup

drop only partially used intermediate value, use template strings,
reduce line bloat while trying to keep it readable.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/www/manager6/lxc/Resources.js b/www/manager6/lxc/Resources.js
index 831ae962b3d3084d7827950c59c8d2dbed8a367c..15ee3c67b7f87ce2cd69ddc6b01d9eb87f2996b5 100644 (file)
--- a/www/manager6/lxc/Resources.js
+++ b/www/manager6/lxc/Resources.js
@@ -201,15 +201,12 @@ Ext.define('PVE.lxc.RessourceView', {
                if (this.text === this.altText) {
                    warn = gettext('Are you sure you want to detach entry {0}');
                }
+               let rendered = me.renderKey(rec.data.key, {}, rec);
+               let msg = Ext.String.format(warn, `'${rendered}'`);
 
-               let key = rec.data.key;
-
-               let rendered = me.renderKey(key, {}, rec);
-               let msg = Ext.String.format(warn, "'" + rendered + "'");
                if (rec.data.key.match(/^unused\d+$/)) {
                    msg += " " + gettext('This will permanently erase all data.');
                }
-
                return msg;
            },
            handler: run_remove,

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
index 9c4b06499d15af23b8f5e8efc9039fc25be97f48..6cea42871cac12299fd6fd8270ae122d9dfd1ad3 100644 (file)
--- a/www/manager6/qemu/HardwareView.js
+++ b/www/manager6/qemu/HardwareView.js
@@ -447,20 +447,16 @@ Ext.define('PVE.qemu.HardwareView', {
            dangerous: true,
            RESTMethod: 'PUT',
            confirmMsg: function(rec) {
-               var warn = gettext('Are you sure you want to remove entry {0}');
+               let warn = gettext('Are you sure you want to remove entry {0}');
                if (this.text === this.altText) {
                    warn = gettext('Are you sure you want to detach entry {0}');
                }
-               var key = rec.data.key;
-               var entry = rows[key];
+               let rendered = me.renderKey(rec.data.key, {}, rec);
+               let msg = Ext.String.format(warn, `'${rendered}'`);
 
-               var rendered = me.renderKey(key, {}, rec);
-               var msg = Ext.String.format(warn, "'" + rendered + "'");
-
-               if (entry.del_extra_msg) {
-                   msg += '<br>' + entry.del_extra_msg;
+               if (rows[rec.data.key].del_extra_msg) {
+                   msg += '<br>' + rows[rec.data.key].del_extra_msg;
                }
-
                return msg;
            },
            handler: function(b, e, rec) {