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 5C1631FF173 for ; Mon, 25 Nov 2024 14:24:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2205F138D3; Mon, 25 Nov 2024 14:24:46 +0100 (CET) Message-ID: <777e4fa5-73d0-42bc-9940-37e231ef7b81@proxmox.com> Date: Mon, 25 Nov 2024 14:24:43 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Backup Server development discussion , Hannes Laimer References: <20241122144713.299130-1-h.laimer@proxmox.com> <20241122144713.299130-21-h.laimer@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20241122144713.299130-21-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pbs-devel] [PATCH proxmox-backup v14 20/26] ui: render 'unmount' maintenance mode correctly X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" comments inline On 11/22/24 15:47, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > www/Utils.js | 4 +++- > www/window/MaintenanceOptions.js | 10 ++++++++++ > 2 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/www/Utils.js b/www/Utils.js > index 7756e9b5d..6bae9b709 100644 > --- a/www/Utils.js > +++ b/www/Utils.js > @@ -775,7 +775,7 @@ Ext.define('PBS.Utils', { > let extra = ''; > > if (activeTasks !== undefined) { > - const conflictingTasks = activeTasks.write + (type === 'offline' ? activeTasks.read : 0); > + const conflictingTasks = activeTasks.write + (type === 'offline' || type === 'unmount' ? activeTasks.read : 0); > > if (conflictingTasks > 0) { > extra += '| '; > @@ -795,6 +795,8 @@ Ext.define('PBS.Utils', { > break; > case 'offline': modeText = gettext("Offline"); > break; > + case 'unmount': modeText = gettext("Unmounting"); > + break; > } > return `${modeText} ${extra}`; > }, > diff --git a/www/window/MaintenanceOptions.js b/www/window/MaintenanceOptions.js > index 527c36987..d7348cb4f 100644 > --- a/www/window/MaintenanceOptions.js > +++ b/www/window/MaintenanceOptions.js > @@ -52,6 +52,7 @@ Ext.define('PBS.window.MaintenanceOptions', { > items: [ > { > xtype: 'pbsMaintenanceType', > + id: 'type-field', same as previous patch: please don't use 'id' for this (especially using such generic names) > name: 'maintenance-type', > fieldLabel: gettext('Maintenance Type'), > value: '__default__', > @@ -85,6 +86,15 @@ Ext.define('PBS.window.MaintenanceOptions', { > }; > } > > + let unmounting = options['maintenance-type'] === 'unmount'; > + let defaultType = options['maintenance-type'] === '__default__'; > + if (unmounting) { > + options['maintenance-type'] = ''; > + } > + > me.callParent([options]); > + > + Ext.ComponentManager.get('type-field').setDisabled(unmounting); > + Ext.ComponentManager.get('message-field').setDisabled(unmounting || defaultType); > }, > }); _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel