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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 39BF3673A1
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 15:53:44 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 2D9CC1810D
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 15:53:14 +0100 (CET)
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 01B2C180FB
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 15:53:13 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BFBB045E5F
for <pbs-devel@lists.proxmox.com>; Mon, 9 Nov 2020 15:53:12 +0100 (CET)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Mon, 9 Nov 2020 15:53:08 +0100
Message-Id: <20201109145308.29679-2-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201109145308.29679-1-f.ebner@proxmox.com>
References: <20201109145308.29679-1-f.ebner@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.027 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: [pbs-devel] [RFC proxmox-backup 2/2] ui: prune: show count for rule
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 09 Nov 2020 14:53:44 -0000
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
www/datastore/Prune.js | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/www/datastore/Prune.js b/www/datastore/Prune.js
index 531204f1..5ff2c459 100644
--- a/www/datastore/Prune.js
+++ b/www/datastore/Prune.js
@@ -76,9 +76,13 @@ Ext.define('PBS.DataStorePruneInputPanel', {
for (let backup of backups) {
if (backup.keep) {
counter[rule]++;
- backup.keepReason = rule;
- if (rule !== 'keep-all' && counter[rule] >= params[rule]) {
- rule = nextRule();
+ if (rule !== 'keep-all') {
+ backup.keepReason = rule + ': ' + counter[rule];
+ if (counter[rule] >= params[rule]) {
+ rule = nextRule();
+ }
+ } else {
+ backup.keepReason = rule;
}
}
}
@@ -212,7 +216,7 @@ Ext.define('PBS.DataStorePrune', {
isCreate: true,
- fieldDefaults: { labelWidth: 120 },
+ fieldDefaults: { labelWidth: 130 },
initComponent: function() {
var me = this;
--
2.20.1