From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 132B21FF164 for ; Wed, 23 Oct 2024 14:37:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0FE541E10D; Wed, 23 Oct 2024 14:38:03 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Wed, 23 Oct 2024 14:37:18 +0200 Message-Id: <20241023123722.124478-3-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241023123722.124478-1-d.kral@proxmox.com> References: <20241023123722.124478-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [me.drive] Subject: [pve-devel] [PATCH manager v3 2/6] ui: vm: improve code readability of CDROM and CloudInit edit modals X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Improves the readability of the CDROM and CloudInit edit modals by making them consistent with each other, i.e. having more readable variable names and storing significant subcomponents in variables. This does not intend any functional changes in the behavior or appearance of either component. Signed-off-by: Daniel Kral --- www/manager6/qemu/CDEdit.js | 14 ++++----- www/manager6/qemu/CIDriveEdit.js | 54 ++++++++++++++++++-------------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/www/manager6/qemu/CDEdit.js b/www/manager6/qemu/CDEdit.js index fd8e5233..d26d8631 100644 --- a/www/manager6/qemu/CDEdit.js +++ b/www/manager6/qemu/CDEdit.js @@ -27,8 +27,8 @@ Ext.define('PVE.qemu.CDInputPanel', { setVMConfig: function(vmconfig) { let me = this; - if (me.bussel) { - me.bussel.setVMConfig(vmconfig, 'cdrom'); + if (me.busSelector) { + me.busSelector.setVMConfig(vmconfig, 'cdrom'); } }, @@ -54,7 +54,7 @@ Ext.define('PVE.qemu.CDInputPanel', { setNodename: function(nodename) { let me = this; - me.isosel.setNodename(nodename); + me.isoSelector.setNodename(nodename); }, initComponent: function() { @@ -65,10 +65,10 @@ Ext.define('PVE.qemu.CDInputPanel', { let items = []; if (!me.confid) { - me.bussel = Ext.create('PVE.form.ControllerSelector', { + me.busSelector = Ext.create('PVE.form.ControllerSelector', { withVirtIO: false, }); - items.push(me.bussel); + items.push(me.busSelector); } items.push({ @@ -94,13 +94,13 @@ Ext.define('PVE.qemu.CDInputPanel', { }); - me.isosel = Ext.create('PVE.form.IsoSelector', { + me.isoSelector = Ext.create('PVE.form.IsoSelector', { nodename: me.nodename, insideWizard: me.insideWizard, name: 'cdimage', }); - items.push(me.isosel); + items.push(me.isoSelector); items.push({ xtype: 'radiofield', diff --git a/www/manager6/qemu/CIDriveEdit.js b/www/manager6/qemu/CIDriveEdit.js index a8f57963..006f9565 100644 --- a/www/manager6/qemu/CIDriveEdit.js +++ b/www/manager6/qemu/CIDriveEdit.js @@ -11,10 +11,12 @@ Ext.define('PVE.qemu.CIDriveInputPanel', { let drive = {}; let params = {}; + let confid = values.controller + values.deviceid; drive.file = values.hdstorage + ":cloudinit"; drive.format = values.diskformat; - params[values.controller + values.deviceid] = PVE.Parser.printQemuDrive(drive); + + params[confid] = PVE.Parser.printQemuDrive(drive); return params; }, @@ -29,7 +31,7 @@ Ext.define('PVE.qemu.CIDriveInputPanel', { setVMConfig: function(config) { let me = this; - me.down('#drive').setVMConfig(config, 'cdrom'); + me.busSelector.setVMConfig(config, 'cdrom'); }, initComponent: function() { @@ -37,22 +39,24 @@ Ext.define('PVE.qemu.CIDriveInputPanel', { me.drive = {}; - me.items = [ - { - xtype: 'pveControllerSelector', - withVirtIO: false, - itemId: 'drive', - fieldLabel: gettext('CloudInit Drive'), - name: 'drive', - }, - { - xtype: 'pveDiskStorageSelector', - itemId: 'storselector', - storageContent: 'images', - nodename: me.nodename, - hideSize: true, - }, - ]; + let items = []; + + me.busSelector = Ext.create('PVE.form.ControllerSelector', { + withVirtIO: false, + fieldLabel: gettext('CloudInit Drive'), + }); + + items.push(me.busSelector); + items.push({ + xtype: 'pveDiskStorageSelector', + itemId: 'storselector', + storageContent: 'images', + nodename: me.nodename, + hideSize: true, + }); + + me.items = items; + me.callParent(); }, }); @@ -62,7 +66,6 @@ Ext.define('PVE.qemu.CIDriveEdit', { xtype: 'pveCIDriveEdit', isCreate: true, - subject: gettext('CloudInit Drive'), initComponent: function() { let me = this; @@ -72,17 +75,20 @@ Ext.define('PVE.qemu.CIDriveEdit', { throw "no node name specified"; } - me.items = [{ - xtype: 'pveCIDriveInputPanel', - itemId: 'cipanel', + let ipanel = Ext.create('PVE.qemu.CIDriveInputPanel', { nodename: nodename, - }]; + }); + + Ext.applyIf(me, { + subject: gettext('CloudInit Drive'), + items: [ipanel], + }); me.callParent(); me.load({ success: function(response, opts) { - me.down('#cipanel').setVMConfig(response.result.data); + ipanel.setVMConfig(response.result.data); }, }); }, -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel