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 841D0695C9 for ; Tue, 2 Mar 2021 12:19:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 824C82BACE for ; Tue, 2 Mar 2021 12:19:42 +0100 (CET) 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 705362BAA5 for ; Tue, 2 Mar 2021 12:19:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 2D5F54586C for ; Tue, 2 Mar 2021 12:19:41 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 2 Mar 2021 12:19:37 +0100 Message-Id: <20210302111940.17276-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210302111940.17276-1-d.csapak@proxmox.com> References: <20210302111940.17276-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.202 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 proxmox-backup 2/5] ui: tape: refactor renderDriveState to Utils 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, 02 Mar 2021 11:19:42 -0000 we will use this later again Signed-off-by: Dominik Csapak --- www/Utils.js | 16 ++++++++++++++++ www/tape/ChangerStatus.js | 18 +----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/www/Utils.js b/www/Utils.js index c531edbb..778dad24 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -603,6 +603,22 @@ Ext.define('PBS.Utils', { }).show(); }, + renderDriveState: function(value, md) { + if (!value) { + return gettext('Idle'); + } + + let icon = ''; + + if (value.startsWith("UPID")) { + let upid = Proxmox.Utils.parse_task_upid(value); + md.tdCls = "pointer"; + return `${icon} ${upid.desc}`; + } + + return `${icon} ${value}`; + }, + }); Ext.define('PBS.Async', { diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js index 2f9c41f8..42306007 100644 --- a/www/tape/ChangerStatus.js +++ b/www/tape/ChangerStatus.js @@ -463,22 +463,6 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { return status; }, - renderState: function(value, md, record) { - if (!value) { - return gettext('Idle'); - } - - let icon = ''; - - if (value.startsWith("UPID")) { - let upid = Proxmox.Utils.parse_task_upid(value); - md.tdCls = "pointer"; - return `${icon} ${upid.desc}`; - } - - return `${icon} ${value}`; - }, - control: { 'grid[reference=drives]': { cellclick: function(table, td, ci, rec, tr, ri, e) { @@ -683,7 +667,7 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { text: gettext('State'), dataIndex: 'state', flex: 3, - renderer: 'renderState', + renderer: PBS.Utils.renderDriveState, }, { text: gettext("Vendor"), -- 2.20.1