From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <f.ebner@proxmox.com> 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 2647C71AB6; 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 E022F23896; 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 9E8D72387A; 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 63F9241FB0; Fri, 9 Apr 2021 10:44:41 +0200 (CEST) From: Fabian Ebner <f.ebner@proxmox.com> To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 9 Apr 2021 10:44:33 +0200 Message-Id: <20210409084436.2454-5-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 proxmox-backup 4/7] ui: tasks: use format_task_status X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Fri, 09 Apr 2021 08:44:43 -0000 Signed-off-by: Fabian Ebner <f.ebner@proxmox.com> --- Dependency bump for widget-toolkit is needed. Changes from v1: * use new helper instead of duplicating changes www/panel/Tasks.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/www/panel/Tasks.js b/www/panel/Tasks.js index a194e478..a64e0eee 100644 --- a/www/panel/Tasks.js +++ b/www/panel/Tasks.js @@ -372,14 +372,7 @@ Ext.define('PBS.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 'ok': // fall-through - case 'warning': // fall-through - default: return value; - } + return Proxmox.Utils.format_task_status(value); }, }, ], -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <f.ebner@proxmox.com> 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 2647C71AB6; 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 E022F23896; 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 9E8D72387A; 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 63F9241FB0; Fri, 9 Apr 2021 10:44:41 +0200 (CEST) From: Fabian Ebner <f.ebner@proxmox.com> To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com Date: Fri, 9 Apr 2021 10:44:33 +0200 Message-Id: <20210409084436.2454-5-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: [pbs-devel] [PATCH v2 proxmox-backup 4/7] ui: tasks: use format_task_status X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Fri, 09 Apr 2021 08:44:43 -0000 Signed-off-by: Fabian Ebner <f.ebner@proxmox.com> --- Dependency bump for widget-toolkit is needed. Changes from v1: * use new helper instead of duplicating changes www/panel/Tasks.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/www/panel/Tasks.js b/www/panel/Tasks.js index a194e478..a64e0eee 100644 --- a/www/panel/Tasks.js +++ b/www/panel/Tasks.js @@ -372,14 +372,7 @@ Ext.define('PBS.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 'ok': // fall-through - case 'warning': // fall-through - default: return value; - } + return Proxmox.Utils.format_task_status(value); }, }, ], -- 2.20.1