* [pve-devel] [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date
@ 2021-12-07 13:08 Fabian Ebner
2021-12-07 13:08 ` [pve-devel] [PATCH manager 2/2] sorters: use correct property 'direction' and keep default 'ASC' Fabian Ebner
2021-12-15 15:03 ` [pve-devel] applied: [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date Thomas Lamprecht
0 siblings, 2 replies; 4+ messages in thread
From: Fabian Ebner @ 2021-12-07 13:08 UTC (permalink / raw)
To: pve-devel
to have the most recent ones first, while keeping backups from the
same guest together.
Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
www/manager6/grid/BackupView.js | 14 ++++++++++----
www/manager6/storage/BackupView.js | 12 ++++++++++++
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/www/manager6/grid/BackupView.js b/www/manager6/grid/BackupView.js
index ffa7d251..7f7e1b62 100644
--- a/www/manager6/grid/BackupView.js
+++ b/www/manager6/grid/BackupView.js
@@ -54,10 +54,16 @@ Ext.define('PVE.grid.BackupView', {
me.store = Ext.create('Ext.data.Store', {
model: 'pve-storage-content',
- sorters: {
- property: 'volid',
- order: 'DESC',
- },
+ sorters: [
+ {
+ property: 'vmid',
+ direction: 'ASC',
+ },
+ {
+ property: 'vdate',
+ direction: 'DESC',
+ },
+ ],
filters: [
vmtypeFilter,
searchFilter,
diff --git a/www/manager6/storage/BackupView.js b/www/manager6/storage/BackupView.js
index dca140fe..2328c0fc 100644
--- a/www/manager6/storage/BackupView.js
+++ b/www/manager6/storage/BackupView.js
@@ -207,5 +207,17 @@ Ext.define('PVE.storage.BackupView', {
}
me.callParent();
+
+ me.store.getSorters().clear();
+ me.store.setSorters([
+ {
+ property: 'vmid',
+ direction: 'ASC',
+ },
+ {
+ property: 'vdate',
+ direction: 'DESC',
+ },
+ ]);
},
});
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pve-devel] [PATCH manager 2/2] sorters: use correct property 'direction' and keep default 'ASC'
2021-12-07 13:08 [pve-devel] [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date Fabian Ebner
@ 2021-12-07 13:08 ` Fabian Ebner
2021-12-16 9:14 ` [pve-devel] applied: " Dominik Csapak
2021-12-15 15:03 ` [pve-devel] applied: [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date Thomas Lamprecht
1 sibling, 1 reply; 4+ messages in thread
From: Fabian Ebner @ 2021-12-07 13:08 UTC (permalink / raw)
To: pve-devel
Ext.util.Sorter does not have an 'order' property, so 'order: DESC'
didn't have an effect. The default is 'ASC' and it is arguably the
preferred direction for all affected sorters anyways.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
www/manager6/ceph/FS.js | 2 +-
www/manager6/dc/ACLView.js | 2 +-
www/manager6/dc/AuthView.js | 2 +-
www/manager6/dc/Backup.js | 2 +-
www/manager6/dc/Cluster.js | 2 +-
www/manager6/dc/GroupView.js | 2 +-
www/manager6/dc/PoolView.js | 2 +-
www/manager6/dc/RoleView.js | 2 +-
www/manager6/dc/SecurityGroups.js | 2 +-
www/manager6/dc/StorageView.js | 2 +-
www/manager6/dc/UserView.js | 2 +-
www/manager6/form/IPRefSelector.js | 2 +-
www/manager6/form/SDNControllerSelector.js | 2 +-
www/manager6/form/SDNDnsSelector.js | 2 +-
www/manager6/form/SDNIpamSelector.js | 2 +-
www/manager6/form/SDNVnetSelector.js | 2 +-
www/manager6/form/SDNZoneSelector.js | 2 +-
www/manager6/form/SecurityGroupSelector.js | 2 +-
www/manager6/form/StorageSelector.js | 2 +-
www/manager6/grid/FirewallAliases.js | 2 +-
www/manager6/grid/FirewallRules.js | 2 +-
www/manager6/grid/PoolMembers.js | 2 +-
www/manager6/ha/GroupSelector.js | 2 +-
www/manager6/ha/Groups.js | 2 +-
www/manager6/node/ACME.js | 2 +-
www/manager6/panel/IPSet.js | 2 +-
www/manager6/sdn/ControllerView.js | 2 +-
www/manager6/sdn/DnsView.js | 2 +-
www/manager6/sdn/IpamView.js | 2 +-
www/manager6/sdn/VnetView.js | 2 +-
www/manager6/sdn/ZoneContentView.js | 2 +-
www/manager6/sdn/ZoneView.js | 2 +-
www/manager6/storage/ContentView.js | 2 +-
33 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/www/manager6/ceph/FS.js b/www/manager6/ceph/FS.js
index 1af5e6cc..e9815355 100644
--- a/www/manager6/ceph/FS.js
+++ b/www/manager6/ceph/FS.js
@@ -119,7 +119,7 @@ Ext.define('PVE.NodeCephFSPanel', {
rstore: view.rstore,
sorters: {
property: 'name',
- order: 'DESC',
+ direction: 'ASC',
},
}));
// manages the "install ceph?" overlay
diff --git a/www/manager6/dc/ACLView.js b/www/manager6/dc/ACLView.js
index a5776ac6..79f900cd 100644
--- a/www/manager6/dc/ACLView.js
+++ b/www/manager6/dc/ACLView.js
@@ -101,7 +101,7 @@ Ext.define('PVE.dc.ACLView', {
},
sorters: {
property: 'path',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/dc/AuthView.js b/www/manager6/dc/AuthView.js
index 48a51015..60332c3f 100644
--- a/www/manager6/dc/AuthView.js
+++ b/www/manager6/dc/AuthView.js
@@ -44,7 +44,7 @@ Ext.define('PVE.dc.AuthView', {
model: 'pmx-domains',
sorters: {
property: 'realm',
- order: 'DESC',
+ direction: 'ASC',
},
},
diff --git a/www/manager6/dc/Backup.js b/www/manager6/dc/Backup.js
index 6f2d39bb..6395ea2b 100644
--- a/www/manager6/dc/Backup.js
+++ b/www/manager6/dc/Backup.js
@@ -76,7 +76,7 @@ Ext.define('PVE.dc.BackupEdit', {
model: 'PVEResources',
sorters: {
property: 'vmid',
- order: 'ASC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/dc/Cluster.js b/www/manager6/dc/Cluster.js
index 3e83268a..afe14bf4 100644
--- a/www/manager6/dc/Cluster.js
+++ b/www/manager6/dc/Cluster.js
@@ -235,7 +235,7 @@ Ext.define('PVE.ClusterAdministration', {
rstore: view.rstore,
sorters: {
property: 'nodeid',
- order: 'DESC',
+ direction: 'ASC',
},
}));
Proxmox.Utils.monStoreErrors(view, view.rstore);
diff --git a/www/manager6/dc/GroupView.js b/www/manager6/dc/GroupView.js
index c2cac152..388edbe3 100644
--- a/www/manager6/dc/GroupView.js
+++ b/www/manager6/dc/GroupView.js
@@ -15,7 +15,7 @@ Ext.define('PVE.dc.GroupView', {
model: 'pve-groups',
sorters: {
property: 'groupid',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/dc/PoolView.js b/www/manager6/dc/PoolView.js
index 0130f5fa..db97cbe7 100644
--- a/www/manager6/dc/PoolView.js
+++ b/www/manager6/dc/PoolView.js
@@ -15,7 +15,7 @@ Ext.define('PVE.dc.PoolView', {
model: 'pve-pools',
sorters: {
property: 'poolid',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/dc/RoleView.js b/www/manager6/dc/RoleView.js
index e4247e23..9cb3fef6 100644
--- a/www/manager6/dc/RoleView.js
+++ b/www/manager6/dc/RoleView.js
@@ -15,7 +15,7 @@ Ext.define('PVE.dc.RoleView', {
model: 'pmx-roles',
sorters: {
property: 'roleid',
- order: 'DESC',
+ direction: 'ASC',
},
});
Proxmox.Utils.monStoreErrors(me, store);
diff --git a/www/manager6/dc/SecurityGroups.js b/www/manager6/dc/SecurityGroups.js
index f43c7e66..5fb6860d 100644
--- a/www/manager6/dc/SecurityGroups.js
+++ b/www/manager6/dc/SecurityGroups.js
@@ -94,7 +94,7 @@ Ext.define('PVE.SecurityGroupList', {
},
sorters: {
property: 'group',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/dc/StorageView.js b/www/manager6/dc/StorageView.js
index c6417ee7..8821b205 100644
--- a/www/manager6/dc/StorageView.js
+++ b/www/manager6/dc/StorageView.js
@@ -37,7 +37,7 @@ Ext.define('PVE.dc.StorageView', {
},
sorters: {
property: 'storage',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/dc/UserView.js b/www/manager6/dc/UserView.js
index f397731d..bbfc4f7c 100644
--- a/www/manager6/dc/UserView.js
+++ b/www/manager6/dc/UserView.js
@@ -18,7 +18,7 @@ Ext.define('PVE.dc.UserView', {
model: 'pmx-users',
sorters: {
property: 'userid',
- order: 'DESC',
+ direction: 'ASC',
},
});
let reload = () => store.load();
diff --git a/www/manager6/form/IPRefSelector.js b/www/manager6/form/IPRefSelector.js
index 1c3bb649..9ccc2fe1 100644
--- a/www/manager6/form/IPRefSelector.js
+++ b/www/manager6/form/IPRefSelector.js
@@ -34,7 +34,7 @@ Ext.define('PVE.form.IPRefSelector', {
},
sorters: {
property: 'ref',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/form/SDNControllerSelector.js b/www/manager6/form/SDNControllerSelector.js
index 19e6db53..639d7b50 100644
--- a/www/manager6/form/SDNControllerSelector.js
+++ b/www/manager6/form/SDNControllerSelector.js
@@ -13,7 +13,7 @@ Ext.define('PVE.form.SDNControllerSelector', {
model: 'pve-sdn-controller',
sorters: {
property: 'controller',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/form/SDNDnsSelector.js b/www/manager6/form/SDNDnsSelector.js
index 9248b490..c97a342f 100644
--- a/www/manager6/form/SDNDnsSelector.js
+++ b/www/manager6/form/SDNDnsSelector.js
@@ -13,7 +13,7 @@ Ext.define('PVE.form.SDNDnsSelector', {
model: 'pve-sdn-dns',
sorters: {
property: 'dns',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/form/SDNIpamSelector.js b/www/manager6/form/SDNIpamSelector.js
index dbe23caa..b60e75d6 100644
--- a/www/manager6/form/SDNIpamSelector.js
+++ b/www/manager6/form/SDNIpamSelector.js
@@ -13,7 +13,7 @@ Ext.define('PVE.form.SDNIpamSelector', {
model: 'pve-sdn-ipam',
sorters: {
property: 'ipam',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/form/SDNVnetSelector.js b/www/manager6/form/SDNVnetSelector.js
index 5421a076..b6da85be 100644
--- a/www/manager6/form/SDNVnetSelector.js
+++ b/www/manager6/form/SDNVnetSelector.js
@@ -13,7 +13,7 @@ Ext.define('PVE.form.SDNVnetSelector', {
model: 'pve-sdn-vnet',
sorters: {
property: 'vnet',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/form/SDNZoneSelector.js b/www/manager6/form/SDNZoneSelector.js
index b79e95f5..28c3457d 100644
--- a/www/manager6/form/SDNZoneSelector.js
+++ b/www/manager6/form/SDNZoneSelector.js
@@ -13,7 +13,7 @@ Ext.define('PVE.form.SDNZoneSelector', {
model: 'pve-sdn-zone',
sorters: {
property: 'zone',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/form/SecurityGroupSelector.js b/www/manager6/form/SecurityGroupSelector.js
index 5eee703e..64db7542 100644
--- a/www/manager6/form/SecurityGroupSelector.js
+++ b/www/manager6/form/SecurityGroupSelector.js
@@ -17,7 +17,7 @@ Ext.define('PVE.form.SecurityGroupsSelector', {
},
sorters: {
property: 'group',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/form/StorageSelector.js b/www/manager6/form/StorageSelector.js
index 5a394538..872bc1ab 100644
--- a/www/manager6/form/StorageSelector.js
+++ b/www/manager6/form/StorageSelector.js
@@ -157,7 +157,7 @@ Ext.define('PVE.form.StorageSelector', {
model: 'pve-storage-status',
sorters: {
property: 'storage',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/grid/FirewallAliases.js b/www/manager6/grid/FirewallAliases.js
index 9c0406d8..00d0d74b 100644
--- a/www/manager6/grid/FirewallAliases.js
+++ b/www/manager6/grid/FirewallAliases.js
@@ -98,7 +98,7 @@ Ext.define('PVE.FirewallAliases', {
},
sorters: {
property: 'name',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/grid/FirewallRules.js b/www/manager6/grid/FirewallRules.js
index 1fe13ea6..b2f6a363 100644
--- a/www/manager6/grid/FirewallRules.js
+++ b/www/manager6/grid/FirewallRules.js
@@ -34,7 +34,7 @@ Ext.define('PVE.form.FWMacroSelector', {
},
sorters: {
property: 'macro',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/grid/PoolMembers.js b/www/manager6/grid/PoolMembers.js
index a8ef4b80..025288cc 100644
--- a/www/manager6/grid/PoolMembers.js
+++ b/www/manager6/grid/PoolMembers.js
@@ -25,7 +25,7 @@ Ext.define('PVE.pool.AddVM', {
sorters: [
{
property: 'vmid',
- order: 'ASC',
+ direction: 'ASC',
},
],
filters: [
diff --git a/www/manager6/ha/GroupSelector.js b/www/manager6/ha/GroupSelector.js
index 020e1eca..61ab0c03 100644
--- a/www/manager6/ha/GroupSelector.js
+++ b/www/manager6/ha/GroupSelector.js
@@ -32,7 +32,7 @@ Ext.define('PVE.ha.GroupSelector', {
model: 'pve-ha-groups',
sorters: {
property: 'group',
- order: 'DESC',
+ direction: 'ASC',
},
},
diff --git a/www/manager6/ha/Groups.js b/www/manager6/ha/Groups.js
index 6281fd54..da5f4479 100644
--- a/www/manager6/ha/Groups.js
+++ b/www/manager6/ha/Groups.js
@@ -16,7 +16,7 @@ Ext.define('PVE.ha.GroupsView', {
model: 'pve-ha-groups',
sorters: {
property: 'group',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/node/ACME.js b/www/manager6/node/ACME.js
index 635787f6..0642e7c5 100644
--- a/www/manager6/node/ACME.js
+++ b/www/manager6/node/ACME.js
@@ -45,7 +45,7 @@ Ext.define('PVE.node.ACMEAccountCreate', {
},
sorters: {
property: 'name',
- order: 'ASC',
+ direction: 'ASC',
},
},
listConfig: {
diff --git a/www/manager6/panel/IPSet.js b/www/manager6/panel/IPSet.js
index 94117789..a4606769 100644
--- a/www/manager6/panel/IPSet.js
+++ b/www/manager6/panel/IPSet.js
@@ -38,7 +38,7 @@ Ext.define('PVE.IPSetList', {
},
sorters: {
property: 'name',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/sdn/ControllerView.js b/www/manager6/sdn/ControllerView.js
index 8d92a715..aff3fb8d 100644
--- a/www/manager6/sdn/ControllerView.js
+++ b/www/manager6/sdn/ControllerView.js
@@ -35,7 +35,7 @@ Ext.define('PVE.sdn.ControllerView', {
},
sorters: {
property: 'controller',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/sdn/DnsView.js b/www/manager6/sdn/DnsView.js
index d1654cab..b34ca946 100644
--- a/www/manager6/sdn/DnsView.js
+++ b/www/manager6/sdn/DnsView.js
@@ -33,7 +33,7 @@ Ext.define('PVE.sdn.DnsView', {
},
sorters: {
property: 'dns',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/sdn/IpamView.js b/www/manager6/sdn/IpamView.js
index 0d00d8e6..9bf32122 100644
--- a/www/manager6/sdn/IpamView.js
+++ b/www/manager6/sdn/IpamView.js
@@ -33,7 +33,7 @@ Ext.define('PVE.sdn.IpamView', {
},
sorters: {
property: 'ipam',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/sdn/VnetView.js b/www/manager6/sdn/VnetView.js
index ce496d52..3fd3c916 100644
--- a/www/manager6/sdn/VnetView.js
+++ b/www/manager6/sdn/VnetView.js
@@ -20,7 +20,7 @@ Ext.define('PVE.sdn.VnetView', {
},
sorters: {
property: 'vnet',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/sdn/ZoneContentView.js b/www/manager6/sdn/ZoneContentView.js
index bce99dff..1ea65450 100644
--- a/www/manager6/sdn/ZoneContentView.js
+++ b/www/manager6/sdn/ZoneContentView.js
@@ -37,7 +37,7 @@ Ext.define('PVE.sdn.ZoneContentView', {
},
sorters: {
property: 'vnet',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/sdn/ZoneView.js b/www/manager6/sdn/ZoneView.js
index ac812d4a..71890dd3 100644
--- a/www/manager6/sdn/ZoneView.js
+++ b/www/manager6/sdn/ZoneView.js
@@ -35,7 +35,7 @@ Ext.define('PVE.sdn.ZoneView', {
},
sorters: {
property: 'zone',
- order: 'DESC',
+ direction: 'ASC',
},
});
diff --git a/www/manager6/storage/ContentView.js b/www/manager6/storage/ContentView.js
index 3a19012d..2874b71e 100644
--- a/www/manager6/storage/ContentView.js
+++ b/www/manager6/storage/ContentView.js
@@ -43,7 +43,7 @@ Ext.define('PVE.storage.ContentView', {
},
sorters: {
property: 'volid',
- order: 'DESC',
+ direction: 'ASC',
},
});
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pve-devel] applied: [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date
2021-12-07 13:08 [pve-devel] [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date Fabian Ebner
2021-12-07 13:08 ` [pve-devel] [PATCH manager 2/2] sorters: use correct property 'direction' and keep default 'ASC' Fabian Ebner
@ 2021-12-15 15:03 ` Thomas Lamprecht
1 sibling, 0 replies; 4+ messages in thread
From: Thomas Lamprecht @ 2021-12-15 15:03 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Ebner
On 07.12.21 14:08, Fabian Ebner wrote:
> to have the most recent ones first, while keeping backups from the
> same guest together.
>
> Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> www/manager6/grid/BackupView.js | 14 ++++++++++----
> www/manager6/storage/BackupView.js | 12 ++++++++++++
> 2 files changed, 22 insertions(+), 4 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 4+ messages in thread
* [pve-devel] applied: [PATCH manager 2/2] sorters: use correct property 'direction' and keep default 'ASC'
2021-12-07 13:08 ` [pve-devel] [PATCH manager 2/2] sorters: use correct property 'direction' and keep default 'ASC' Fabian Ebner
@ 2021-12-16 9:14 ` Dominik Csapak
0 siblings, 0 replies; 4+ messages in thread
From: Dominik Csapak @ 2021-12-16 9:14 UTC (permalink / raw)
To: Proxmox VE development discussion, Fabian Ebner
applied, thanks. wanted to do a version with the lines remove first,
but this way it should not happen again when someone copies
a sorter
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-12-16 9:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-07 13:08 [pve-devel] [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date Fabian Ebner
2021-12-07 13:08 ` [pve-devel] [PATCH manager 2/2] sorters: use correct property 'direction' and keep default 'ASC' Fabian Ebner
2021-12-16 9:14 ` [pve-devel] applied: " Dominik Csapak
2021-12-15 15:03 ` [pve-devel] applied: [PATCH manager 1/2] backup views: sort backups by vmid, then descending by date Thomas Lamprecht
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal