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 59DF96B0C8 for ; Thu, 18 Feb 2021 09:18:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 54C9EAB4B for ; Thu, 18 Feb 2021 09:18:11 +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 783B6AB38 for ; Thu, 18 Feb 2021 09:18:10 +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 3CCA74617A for ; Thu, 18 Feb 2021 09:18:10 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 18 Feb 2021 09:18:07 +0100 Message-Id: <20210218081809.9182-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.218 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 1/3] ui: tape/ChangerStatus: add Inventory column to drives/import-export 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, 18 Feb 2021 08:18:11 -0000 Signed-off-by: Dominik Csapak --- www/tape/ChangerStatus.js | 52 +++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/www/tape/ChangerStatus.js b/www/tape/ChangerStatus.js index c51dea4b..9837481b 100644 --- a/www/tape/ChangerStatus.js +++ b/www/tape/ChangerStatus.js @@ -470,6 +470,26 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { Proxmox.Utils.setErrorMask(me.lookup('content'), err); } }, + + renderIsLabeled: function(value, mD, record) { + if (!record.data['label-text']) { + return ""; + } + + if (record.data['label-text'].startsWith("CLN")) { + return ""; + } + + if (!value) { + return gettext('Not Labeled'); + } + + let status = record.data.status; + if (record.data.pool) { + return `${status} (${record.data.pool})`; + } + return status; + }, }, listeners: { @@ -551,26 +571,8 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { { text: gettext('Inventory'), dataIndex: 'is-labeled', + renderer: 'renderIsLabeled', flex: 1, - renderer: function(value, mD, record) { - if (!record.data['label-text']) { - return ""; - } - - if (record.data['label-text'].startsWith("CLN")) { - return ""; - } - - if (!value) { - return gettext('Not Labeled'); - } - - let status = record.data.status; - if (record.data.pool) { - return `${status} (${record.data.pool})`; - } - return status; - }, }, { text: gettext('Actions'), @@ -626,6 +628,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { flex: 1, renderer: (value) => value || '', }, + { + text: gettext('Inventory'), + dataIndex: 'is-labeled', + renderer: 'renderIsLabeled', + flex: 1, + }, { text: gettext("Name"), sortable: true, @@ -716,6 +724,12 @@ Ext.define('PBS.TapeManagement.ChangerStatus', { renderer: (value) => value || '', flex: 1, }, + { + text: gettext('Inventory'), + dataIndex: 'is-labeled', + renderer: 'renderIsLabeled', + flex: 1, + }, { text: gettext('Actions'), xtype: 'actioncolumn', -- 2.20.1