Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 12:56:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: show both emails in user list

Browse Source 
if user has a confirmed email and a pending email change show both in the acp
This commit is contained in:
Barış Soner Uşaklı
2023-06-26 20:33:28 -04:00
parent a814440cd8
commit daa5ac85e9
5 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/admin/users.js
View File

@@ -187,11 +187,12 @@ async function loadUserInfo(callerUid, uids) {
user.lastonlineISO = utils.toISOString(timestamp);
user.ips = ips[index];
user.ip = ips[index] && ips[index][0] ? ips[index][0] : null;
if (confirmObjs[index]) {
user.emailToConfirm = user.email;
if (confirmObjs[index] && confirmObjs[index].email) {
const confirmObj = confirmObjs[index];
user['email:expired'] = !confirmObj.expires || Date.now() >= confirmObj.expires;
user['email:pending'] = confirmObj.expires && Date.now() < confirmObj.expires;
user.email = confirmObj.email;
user.emailToConfirm = confirmObj.email;
}
}
});