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 778496081C for ; Thu, 13 Aug 2020 10:29:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6356B180E9 for ; Thu, 13 Aug 2020 10:29:26 +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 9BF7E18091 for ; Thu, 13 Aug 2020 10:29:23 +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 66FD4445D8 for ; Thu, 13 Aug 2020 10:29:23 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 13 Aug 2020 10:29:20 +0200 Message-Id: <20200813082921.28946-9-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200813082921.28946-1-d.csapak@proxmox.com> References: <20200813082921.28946-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.050 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup v3 8/9] ui: syncjob: improve task text rendering 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: Thu, 13 Aug 2020 08:29:27 -0000 to also have the correct icons for warnings and unknown tasks the text is here "ERROR: ..." now, so leave the 'Error' out Signed-off-by: Dominik Csapak --- www/config/SyncView.js | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/www/config/SyncView.js b/www/config/SyncView.js index 634977c4..94e40d03 100644 --- a/www/config/SyncView.js +++ b/www/config/SyncView.js @@ -107,11 +107,27 @@ Ext.define('PBS.config.SyncJobView', { return ''; } - if (value === 'OK') { - return ` ${gettext("OK")}`; + let parsed = Proxmox.Utils.parse_task_status(value); + let text = value; + let icon = ''; + switch (parsed) { + case 'unknown': + icon = 'question faded'; + text = Proxmox.Utils.unknownText; + break; + case 'error': + icon = 'times critical'; + text = Proxmox.Utils.errorText + ': ' + value; + break; + case 'warning': + icon = 'exclamation warning'; + break; + case 'ok': + icon = 'check good'; + text = gettext("OK"); } - return ` ${gettext("Error")}:${value}`; + return ` ${text}`; }, render_next_run: function(value, metadat, record) { -- 2.20.1