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 361A271AB9; Fri, 9 Apr 2021 10:44:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EC897238A6; Fri, 9 Apr 2021 10:44:42 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 82DAA2386B; Fri, 9 Apr 2021 10:44:41 +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 41F7942004; Fri, 9 Apr 2021 10:44:41 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 9 Apr 2021 10:44:30 +0200 Message-Id: <20210409084436.2454-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210409084436.2454-1-f.ebner@proxmox.com> References: <20210409084436.2454-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 v2 widget-toolkit 1/7] task status: create helper for formatting 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: , X-List-Received-Date: Fri, 09 Apr 2021 08:44:43 -0000 Signed-off-by: Fabian Ebner --- New in v2. src/Utils.js | 12 ++++++++++++ src/node/Tasks.js | 10 +--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/Utils.js b/src/Utils.js index 3fd8f91..21bdbe3 100644 --- a/src/Utils.js +++ b/src/Utils.js @@ -736,6 +736,18 @@ utilities: { return 'error'; }, + format_task_status: function(value) { + let parsed = Proxmox.Utils.parse_task_status(value); + switch (parsed) { + case 'unknown': return Proxmox.Utils.unknownText; + case 'error': return Proxmox.Utils.errorText + ': ' + value; + case 'warning': return Proxmox.Utils.warningsText + + value.replace('WARNINGS', ''); + case 'ok': // fall-through + default: return value; + } + }, + render_duration: function(value) { if (value === undefined) { return '-'; diff --git a/src/node/Tasks.js b/src/node/Tasks.js index b01f65e..7f20a8a 100644 --- a/src/node/Tasks.js +++ b/src/node/Tasks.js @@ -198,15 +198,7 @@ Ext.define('Proxmox.node.Tasks', { return ''; } - let parsed = Proxmox.Utils.parse_task_status(value); - switch (parsed) { - case 'unknown': return Proxmox.Utils.unknownText; - case 'error': return Proxmox.Utils.errorText + ': ' + value; - case 'warning': return Proxmox.Utils.warningsText + - value.replace('WARNINGS', ''); - case 'ok': // fall-through - default: return value; - } + return Proxmox.Utils.format_task_status(value); }, }, ], -- 2.20.1