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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0BBA770270 for ; Thu, 5 May 2022 15:53:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EBD2A26AF for ; Thu, 5 May 2022 15:53:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 67A0426A5 for ; Thu, 5 May 2022 15:53:57 +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 C44F54319C for ; Thu, 5 May 2022 15:53:56 +0200 (CEST) From: Stefan Sterz To: pbs-devel@lists.proxmox.com Date: Thu, 5 May 2022 15:52:49 +0200 Message-Id: <20220505135252.466838-3-s.sterz@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220505135252.466838-1-s.sterz@proxmox.com> References: <20220505135252.466838-1-s.sterz@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH widget-toolkit v1 2/3] fix #4001: FileBrowser: show number of items in a directory as size 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, 05 May 2022 13:53:58 -0000 Signed-off-by: Stefan Sterz --- src/window/FileBrowser.js | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/window/FileBrowser.js b/src/window/FileBrowser.js index bb262bc..54967c2 100644 --- a/src/window/FileBrowser.js +++ b/src/window/FileBrowser.js @@ -2,6 +2,19 @@ Ext.define('proxmox-file-tree', { extend: 'Ext.data.Model', fields: ['filepath', 'text', 'type', 'size', + { + name: 'sizedisplay', + calculate: data => { + if (data.size === undefined) { + return ''; + } else if (data.type === 'd') { + let fs = data.size === 1 ? gettext('{0} item') : gettext('{0} items'); + return Ext.String.format(fs, data.size); + } + + return Proxmox.Utils.format_size(data.size); + }, + }, { name: 'mtime', type: 'date', @@ -270,10 +283,15 @@ Ext.define("Proxmox.window.FileBrowser", { }, { text: gettext('Size'), - dataIndex: 'size', - renderer: value => value === undefined ? '' : Proxmox.Utils.format_size(value), + dataIndex: 'sizedisplay', sorter: { sorterFn: function(a, b) { + if (a.data.type === 'd' && b.data.type !== 'd') { + return -1; + } else if (a.data.type !== 'd' && b.data.type === 'd') { + return 1; + } + let asize = a.data.size || 0; let bsize = b.data.size || 0; -- 2.30.2