From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1B7BD7A926 for ; Tue, 5 Jul 2022 15:09:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 87C262F4F6 for ; Tue, 5 Jul 2022 15:08:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 5 Jul 2022 15:08:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A8F0043DC8 for ; Tue, 5 Jul 2022 15:08:48 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 5 Jul 2022 13:08:22 +0000 Message-Id: <20220705130834.14285-17-h.laimer@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220705130834.14285-1-h.laimer@proxmox.com> References: <20220705130834.14285-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.043 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [activetasks.read] Subject: [pbs-devel] [PATCH proxmox-backup 14/26] ui: maintenance edit: disable description in maintenance edit if no type is selected 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: , X-List-Received-Date: Tue, 05 Jul 2022 13:09:27 -0000 Signed-off-by: Hannes Laimer --- www/Utils.js | 5 ++++- www/window/MaintenanceOptions.js | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/www/Utils.js b/www/Utils.js index a1f17bdc..977a5255 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -666,7 +666,8 @@ Ext.define('PBS.Utils', { let extra = ''; if (activeTasks !== undefined) { - const conflictingTasks = activeTasks.write + (maintenance.type === 'offline' ? activeTasks.read : 0); + const conflictingTasks = activeTasks.write + + (['offline', 'unplugged'].includes(maintenance.type) ? activeTasks.read : 0); if (conflictingTasks > 0) { extra += '| '; @@ -682,6 +683,8 @@ Ext.define('PBS.Utils', { let modeText = Proxmox.Utils.unknownText; switch (maintenance.type) { + case 'unplugged': modeText = `${gettext("Unplugged")}`; + break; case 'read-only': modeText = gettext("Read-only"); break; case 'offline': modeText = gettext("Offline"); diff --git a/www/window/MaintenanceOptions.js b/www/window/MaintenanceOptions.js index 3cd3e2ce..8907d75d 100644 --- a/www/window/MaintenanceOptions.js +++ b/www/window/MaintenanceOptions.js @@ -54,14 +54,20 @@ Ext.define('PBS.window.MaintenanceOptions', { xtype: 'pbsMaintenanceType', name: 'maintenance-type', fieldLabel: gettext('Maintenance Type'), + listeners: { + change: (_picker, newValue, _oldValue) => { + Ext.ComponentManager.get('message-field') + .setDisabled(newValue === '__default__'); + }, + }, value: '__default__', deleteEmpty: true, }, { xtype: 'proxmoxtextfield', + id: 'message-field', name: 'maintenance-msg', fieldLabel: gettext('Description'), - // FIXME: disable if maintenance type is none }, ], }, @@ -81,5 +87,8 @@ Ext.define('PBS.window.MaintenanceOptions', { } me.callParent([options]); + + Ext.ComponentManager.get('message-field') + .setDisabled(options['maintenance-type'] === '__default__'); }, }); -- 2.30.2