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 F3DC21FF380 for ; Fri, 19 Apr 2024 17:56:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7372DE600; Fri, 19 Apr 2024 17:56:50 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Fri, 19 Apr 2024 17:56:03 +0200 Message-Id: <20240419155606.112010-21-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419155606.112010-1-h.laimer@proxmox.com> References: <20240419155606.112010-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 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: [pbs-devel] [PATCH proxmox-backup v8 20/23] 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" 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 ad2b2777..5af2baca 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -698,7 +698,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 += '| '; @@ -718,6 +718,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 527c3698..d7348cb4 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', 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); }, }); -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel