From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 72F481FF17A for ; Fri, 18 Jul 2025 15:37:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 32A4F1F624; Fri, 18 Jul 2025 15:38:51 +0200 (CEST) From: Shannon Sterz To: pve-devel@lists.proxmox.com Date: Fri, 18 Jul 2025 15:38:46 +0200 Message-Id: <20250718133846.101784-1-s.sterz@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1752845924305 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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 Subject: [pve-devel] [PATCH manager] fix #6534: ui: keep displaying help button in backup edit dialog 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" previously the help button would disappear once either the "Notifications" or "Retention" tabs was opened. this removes an unnecessary extra container and sets the value for all tab so that the help button stays present. Signed-off-by: Shannon Sterz --- this may look worse than it is, most of this is just indentation changes. www/manager6/dc/Backup.js | 258 ++++++++++++++++++-------------------- 1 file changed, 125 insertions(+), 133 deletions(-) diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js index 0ad49568c..7dfb6f7dc 100644 --- a/www/manager6/dc/Backup.js +++ b/www/manager6/dc/Backup.js @@ -224,145 +224,135 @@ Ext.define('PVE.dc.BackupEdit', { bodyPadding: 10, items: [ { - xtype: 'container', title: gettext('General'), - region: 'center', - layout: { - type: 'vbox', - align: 'stretch', - }, - items: [ + xtype: 'inputpanel', + onlineHelp: 'chapter_vzdump', + column1: [ { - xtype: 'inputpanel', - onlineHelp: 'chapter_vzdump', - column1: [ - { - xtype: 'pveNodeSelector', - name: 'node', - fieldLabel: gettext('Node'), - allowBlank: true, - editable: true, - autoSelect: false, - emptyText: '-- ' + gettext('All') + ' --', - listeners: { - change: 'nodeChange', - }, - }, - { - xtype: 'pveStorageSelector', - reference: 'storageSelector', - fieldLabel: gettext('Storage'), - clusterView: true, - storageContent: 'backup', - allowBlank: false, - name: 'storage', - listeners: { - change: 'storageChange', - }, - }, - { - xtype: 'pveCalendarEvent', - fieldLabel: gettext('Schedule'), - allowBlank: false, - name: 'schedule', - }, - { - xtype: 'proxmoxKVComboBox', - reference: 'modeSelector', - comboItems: [ - ['include', gettext('Include selected VMs')], - ['all', gettext('All')], - ['exclude', gettext('Exclude selected VMs')], - ['pool', gettext('Pool based')], - ], - fieldLabel: gettext('Selection mode'), - name: 'selMode', - value: '', - bind: { - value: '{selMode}', - }, - listeners: { - change: 'modeChange', - }, - }, - { - xtype: 'pvePoolSelector', - reference: 'poolSelector', - fieldLabel: gettext('Pool to backup'), - hidden: true, - allowBlank: false, - name: 'pool', - listeners: { - change: 'selectPoolMembers', - }, - bind: { - hidden: '{!poolMode}', - disabled: '{!poolMode}', - }, - }, + xtype: 'pveNodeSelector', + name: 'node', + fieldLabel: gettext('Node'), + allowBlank: true, + editable: true, + autoSelect: false, + emptyText: '-- ' + gettext('All') + ' --', + listeners: { + change: 'nodeChange', + }, + }, + { + xtype: 'pveStorageSelector', + reference: 'storageSelector', + fieldLabel: gettext('Storage'), + clusterView: true, + storageContent: 'backup', + allowBlank: false, + name: 'storage', + listeners: { + change: 'storageChange', + }, + }, + { + xtype: 'pveCalendarEvent', + fieldLabel: gettext('Schedule'), + allowBlank: false, + name: 'schedule', + }, + { + xtype: 'proxmoxKVComboBox', + reference: 'modeSelector', + comboItems: [ + ['include', gettext('Include selected VMs')], + ['all', gettext('All')], + ['exclude', gettext('Exclude selected VMs')], + ['pool', gettext('Pool based')], ], - column2: [ - { - xtype: 'pveBackupCompressionSelector', - reference: 'compressionSelector', - fieldLabel: gettext('Compression'), - name: 'compress', - cbind: { - deleteEmpty: '{!isCreate}', - }, - value: 'zstd', - listeners: { - change: 'compressionChange', - disable: 'compressionDisable', - enable: 'compressionEnable', - }, - }, - { - xtype: 'pveBackupModeSelector', - fieldLabel: gettext('Mode'), - value: 'snapshot', - name: 'mode', - }, - { - xtype: 'proxmoxcheckbox', - fieldLabel: gettext('Enable'), - name: 'enabled', - uncheckedValue: 0, - defaultValue: 1, - checked: true, - }, - ], - columnB: [ - { - xtype: 'proxmoxtextfield', - name: 'comment', - fieldLabel: gettext('Job Comment'), - cbind: { - deleteEmpty: '{!isCreate}', - }, - autoEl: { - tag: 'div', - 'data-qtip': gettext('Description of the job'), - }, - }, - { - xtype: 'vmselector', - reference: 'vmgrid', - height: 300, - name: 'vmid', - disabled: true, - allowBlank: false, - columnSelection: ['vmid', 'node', 'status', 'name', 'type'], - bind: { - disabled: '{disableVMSelection}', - }, - }, - ], - onGetValues: function (values) { - return this.up('window').getController().onGetValues(values); + fieldLabel: gettext('Selection mode'), + name: 'selMode', + value: '', + bind: { + value: '{selMode}', + }, + listeners: { + change: 'modeChange', + }, + }, + { + xtype: 'pvePoolSelector', + reference: 'poolSelector', + fieldLabel: gettext('Pool to backup'), + hidden: true, + allowBlank: false, + name: 'pool', + listeners: { + change: 'selectPoolMembers', + }, + bind: { + hidden: '{!poolMode}', + disabled: '{!poolMode}', }, }, ], + column2: [ + { + xtype: 'pveBackupCompressionSelector', + reference: 'compressionSelector', + fieldLabel: gettext('Compression'), + name: 'compress', + cbind: { + deleteEmpty: '{!isCreate}', + }, + value: 'zstd', + listeners: { + change: 'compressionChange', + disable: 'compressionDisable', + enable: 'compressionEnable', + }, + }, + { + xtype: 'pveBackupModeSelector', + fieldLabel: gettext('Mode'), + value: 'snapshot', + name: 'mode', + }, + { + xtype: 'proxmoxcheckbox', + fieldLabel: gettext('Enable'), + name: 'enabled', + uncheckedValue: 0, + defaultValue: 1, + checked: true, + }, + ], + columnB: [ + { + xtype: 'proxmoxtextfield', + name: 'comment', + fieldLabel: gettext('Job Comment'), + cbind: { + deleteEmpty: '{!isCreate}', + }, + autoEl: { + tag: 'div', + 'data-qtip': gettext('Description of the job'), + }, + }, + { + xtype: 'vmselector', + reference: 'vmgrid', + height: 300, + name: 'vmid', + disabled: true, + allowBlank: false, + columnSelection: ['vmid', 'node', 'status', 'name', 'type'], + bind: { + disabled: '{disableVMSelection}', + }, + }, + ], + onGetValues: function (values) { + return this.up('window').getController().onGetValues(values); + }, }, { xtype: 'pveBackupNotificationOptionsPanel', @@ -385,6 +375,7 @@ Ext.define('PVE.dc.BackupEdit', { }, { xtype: 'inputpanel', + onlineHelp: 'chapter_vzdump', title: gettext('Note Template'), region: 'center', layout: { @@ -431,6 +422,7 @@ Ext.define('PVE.dc.BackupEdit', { }, { xtype: 'pveBackupAdvancedOptionsPanel', + onlineHelp: 'chapter_vzdump', reference: 'backupAdvanced', title: gettext('Advanced'), cbind: { -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel