* [pbs-devel] [PATCH proxmox-backup] prune sim: show count for rule
@ 2020-11-10 9:54 Fabian Ebner
2020-11-10 10:48 ` [pbs-devel] applied: " Thomas Lamprecht
0 siblings, 1 reply; 2+ messages in thread
From: Fabian Ebner @ 2020-11-10 9:54 UTC (permalink / raw)
To: pbs-devel
and rename 'all zero' to 'keep-all' to make it consistent with the prune dialog
in PBS.
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
docs/prune-simulator/prune-simulator.js | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/docs/prune-simulator/prune-simulator.js b/docs/prune-simulator/prune-simulator.js
index c2076dcf..85c2a7b2 100644
--- a/docs/prune-simulator/prune-simulator.js
+++ b/docs/prune-simulator/prune-simulator.js
@@ -152,7 +152,12 @@ Ext.onReady(function() {
dataIndex: 'mark',
renderer: function(value, metaData, record) {
if (record.data.mark === 'keep') {
- return 'keep (' + record.data.keepName + ')';
+ if (record.data.keepCount) {
+ return 'keep (' + record.data.keepName +
+ ': ' + record.data.keepCount + ')';
+ } else {
+ return 'keep (' + record.data.keepName + ')';
+ }
} else {
return value;
}
@@ -213,7 +218,11 @@ Ext.onReady(function() {
if (backup.data.mark === 'remove') {
html += `<span class="strikethrough">${text}</span>`;
} else {
- text += ` (${backup.data.keepName})`;
+ if (backup.data.keepCount) {
+ text += ` (${backup.data.keepName}: ${backup.data.keepCount})`;
+ } else {
+ text += ` (${backup.data.keepName})`;
+ }
if (me.useColors) {
let bgColor = COLORS[backup.data.keepName];
let textColor = TEXT_COLORS[backup.data.keepName];
@@ -470,6 +479,7 @@ Ext.onReady(function() {
newlyIncludedCount++;
backup.mark = 'keep';
backup.keepName = keepName;
+ backup.keepCount = newlyIncludedCount;
} else {
backup.mark = 'remove';
}
@@ -488,7 +498,7 @@ Ext.onReady(function() {
Number(keepParams['keep-yearly']) === 0) {
backups.forEach(function(backup) {
backup.mark = 'keep';
- backup.keepName = 'all zero';
+ backup.keepName = 'keep-all';
});
return;
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pbs-devel] applied: [PATCH proxmox-backup] prune sim: show count for rule
2020-11-10 9:54 [pbs-devel] [PATCH proxmox-backup] prune sim: show count for rule Fabian Ebner
@ 2020-11-10 10:48 ` Thomas Lamprecht
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Lamprecht @ 2020-11-10 10:48 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Fabian Ebner
On 10.11.20 10:54, Fabian Ebner wrote:
> and rename 'all zero' to 'keep-all' to make it consistent with the prune dialog
> in PBS.
>
> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
> ---
> docs/prune-simulator/prune-simulator.js | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
>
applied, thanks!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-10 10:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-10 9:54 [pbs-devel] [PATCH proxmox-backup] prune sim: show count for rule Fabian Ebner
2020-11-10 10:48 ` [pbs-devel] applied: " 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