From: Matthias Heiserer <m.heiserer@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v4 manager 4/4] ui: content view: remove dead code
Date: Mon, 4 Apr 2022 15:02:11 +0200 [thread overview]
Message-ID: <20220404130211.4138797-5-m.heiserer@proxmox.com> (raw)
In-Reply-To: <20220404130211.4138797-1-m.heiserer@proxmox.com>
These lines were only used by grid/BackupView, which gets deleted in
this series.
Signed-off-by: Matthias Heiserer <m.heiserer@proxmox.com>
---
No changes from v2/v3
www/manager6/storage/ContentView.js | 43 ++++++-----------------------
1 file changed, 8 insertions(+), 35 deletions(-)
diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index 2874b71e..56c11037 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -147,58 +147,31 @@ Ext.define('PVE.storage.ContentView', {
},
);
- let availableColumns = {
- 'name': {
+ const columns = [
+ {
header: gettext('Name'),
flex: 2,
sortable: true,
renderer: PVE.Utils.render_storage_content,
dataIndex: 'text',
},
- 'notes': {
- header: gettext('Notes'),
- flex: 1,
- renderer: Ext.htmlEncode,
- dataIndex: 'notes',
- },
- 'protected': {
- header: `<i class="fa fa-shield"></i>`,
- tooltip: gettext('Protected'),
- width: 30,
- renderer: v => v ? `<i data-qtip="${gettext('Protected')}" class="fa fa-shield"></i>` : '',
- sorter: (a, b) => (b.data.protected || 0) - (a.data.protected || 0),
- dataIndex: 'protected',
- },
- 'date': {
+ {
header: gettext('Date'),
width: 150,
dataIndex: 'vdate',
},
- 'format': {
+ {
header: gettext('Format'),
width: 100,
dataIndex: 'format',
},
- 'size': {
+ {
header: gettext('Size'),
width: 100,
renderer: Proxmox.Utils.format_size,
dataIndex: 'size',
},
- };
-
- let showColumns = me.showColumns || ['name', 'date', 'format', 'size'];
-
- Object.keys(availableColumns).forEach(function(key) {
- if (!showColumns.includes(key)) {
- delete availableColumns[key];
- }
- });
-
- if (me.extraColumns && typeof me.extraColumns === 'object') {
- Object.assign(availableColumns, me.extraColumns);
- }
- const columns = Object.values(availableColumns);
+ ];
Ext.apply(me, {
store: store,
@@ -216,8 +189,8 @@ Ext.define('PVE.storage.ContentView', {
Ext.define('pve-storage-content', {
extend: 'Ext.data.Model',
fields: [
- 'volid', 'content', 'format', 'size', 'used', 'vmid',
- 'channel', 'id', 'lun', 'notes', 'verification',
+ 'volid', 'content', 'format', 'size', 'used',
+ 'channel', 'id', 'lun',
{
name: 'text',
convert: function(value, record) {
--
2.30.2
next prev parent reply other threads:[~2022-04-04 13:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 13:02 [pve-devel] [PATCH v4 manager 0/4] BackupView as TreePanel Matthias Heiserer
2022-04-04 13:02 ` [pve-devel] [PATCH v4 manager 1/4] ui: Utils: Helpers for backup type and icon Matthias Heiserer
2022-04-04 13:02 ` [pve-devel] [PATCH v4 manager 2/4] ui: storage: Rewrite backup content view as TreePanel Matthias Heiserer
2022-04-06 11:25 ` Fabian Ebner
2022-04-04 13:02 ` [pve-devel] [PATCH v4 manager 3/4] ui: delete BackupView and replace it with the new Tree BackupView Matthias Heiserer
2022-04-04 13:02 ` Matthias Heiserer [this message]
2022-04-06 11:26 ` [pve-devel] [PATCH v4 manager 0/4] BackupView as TreePanel Fabian Ebner
2022-04-06 15:40 ` Thomas Lamprecht
2022-04-07 6:31 ` Fabian Ebner
2022-04-07 6:57 ` Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220404130211.4138797-5-m.heiserer@proxmox.com \
--to=m.heiserer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox