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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 42CAE6057D
for <pve-devel@lists.proxmox.com>; Wed, 2 Sep 2020 13:03:49 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 3306610126
for <pve-devel@lists.proxmox.com>; Wed, 2 Sep 2020 13:03:49 +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 5F82E100F3
for <pve-devel@lists.proxmox.com>; Wed, 2 Sep 2020 13:03:47 +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 1BB65449D1
for <pve-devel@lists.proxmox.com>; Wed, 2 Sep 2020 13:03:47 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 2 Sep 2020 13:03:27 +0200
Message-Id: <20200902110337.25004-5-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200902110337.25004-1-f.ebner@proxmox.com>
References: <20200902110337.25004-1-f.ebner@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
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 manager 04/14] remove the now unneccessary
grouping
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: Wed, 02 Sep 2020 11:03:49 -0000
since there are no grouping headers anymore, the situation
with the empty volid shouldn't happen anymore.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
www/manager6/storage/ContentView.js | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index c067d3e0..2c320bec 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -357,12 +357,6 @@ Ext.define('PVE.storage.ContentView', {
trackOver: false,
loadMask: false
},
- features: [
- {
- ftype: 'grouping',
- groupHeaderTpl: '{name} ({rows.length} Item{[values.rows.length > 1 ? "s" : ""]})'
- }
- ],
initComponent : function() {
var me = this;
@@ -630,9 +624,7 @@ Ext.define('PVE.storage.ContentView', {
{
name: 'text',
convert: function(value, record) {
- // check for volid, because if you click on a grouping header,
- // it calls convert (but with an empty volid)
- if (value || record.data.volid === null) {
+ if (value) {
return value;
}
return PVE.Utils.render_storage_content(value, {}, record);
@@ -641,9 +633,7 @@ Ext.define('PVE.storage.ContentView', {
{
name: 'vdate',
convert: function(value, record) {
- // check for volid, because if you click on a grouping header,
- // it calls convert (but with an empty volid)
- if (value || record.data.volid === null) {
+ if (value) {
return value;
}
let t = record.data.content;
--
2.20.1