From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <p.hufnagl@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 0413499155
for <pve-devel@lists.proxmox.com>; Tue, 10 Oct 2023 12:41:20 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id D7D4A31740
for <pve-devel@lists.proxmox.com>; Tue, 10 Oct 2023 12:40:49 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(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
for <pve-devel@lists.proxmox.com>; Tue, 10 Oct 2023 12:40:48 +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 80ABC449A4
for <pve-devel@lists.proxmox.com>; Tue, 10 Oct 2023 12:40:48 +0200 (CEST)
From: Philipp Hufnagl <p.hufnagl@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 10 Oct 2023 12:40:31 +0200
Message-Id: <20231010104034.932760-3-p.hufnagl@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231010104034.932760-1-p.hufnagl@proxmox.com>
References: <20231010104034.932760-1-p.hufnagl@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.086 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
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 proxmox-widget-toolkit v2 2/3] fix #4546: utils:
Highlight accounts in user management that exprie soon
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: Tue, 10 Oct 2023 10:41:20 -0000
When a user account is about to expire in the next 7 days, the date
column will be highlighted with warning color.
Signed-off-by: Philipp Hufnagl <p.hufnagl@proxmox.com>
---
src/Utils.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/Utils.js b/src/Utils.js
index f269607..f5769a0 100644
--- a/src/Utils.js
+++ b/src/Utils.js
@@ -174,10 +174,14 @@ utilities: {
return value ? Proxmox.Utils.enabledText : Proxmox.Utils.disabledText;
},
- format_expire: function(date) {
+ format_expire: function(date, meta) {
if (!date) {
return Proxmox.Utils.neverText;
}
+ let expiryWarningThreshold = Ext.Date.add(new Date(), Ext.Date.DAY, 7);
+ if (expiryWarningThreshold >= date) {
+ meta.tdCls += 'proxmox-warning-row';
+ }
return Ext.Date.format(date, "Y-m-d");
},
--
2.39.2