Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add not validated/expired

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-06-06 20:55:52 -04:00
parent 61ae48e90d
commit 5fae09f3aa
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en-GB/admin/manage/users.json
View File

@@ -51,6 +51,7 @@
"users.email": "email", "users.email": "email",
"users.no-email": "(no email)", "users.no-email": "(no email)",
"users.validated": "Validated", "users.validated": "Validated",
"users.not-validated": "Not Validated",
"users.validation-pending": "Validation Pending", "users.validation-pending": "Validation Pending",
"users.validation-expired": "Validation Expired", "users.validation-expired": "Validation Expired",
"users.ip": "IP", "users.ip": "IP",

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

@@ -191,8 +191,6 @@ async function loadUserInfo(callerUid, uids) {
const confirmObj = confirmObjs[index]; const confirmObj = confirmObjs[index];
user['email:expired'] = !confirmObj.expires || Date.now() >= confirmObj.expires; user['email:expired'] = !confirmObj.expires || Date.now() >= confirmObj.expires;
user['email:pending'] = confirmObj.expires && Date.now() < confirmObj.expires; user['email:pending'] = confirmObj.expires && Date.now() < confirmObj.expires;
} else if (!user['email:confirmed']) {
user['email:expired'] = true;
} }
} }
}); });

5
src/views/admin/manage/users.tpl
View File

@@ -114,7 +114,10 @@
<i class="pending fa fa-fw fa-clock-o text-warning{{{ if !users.email:pending }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validation-pending]]" data-bs-toggle="tooltip"></i> <i class="pending fa fa-fw fa-clock-o text-warning{{{ if !users.email:pending }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validation-pending]]" data-bs-toggle="tooltip"></i>
<i class="notvalidated fa fa-fw fa-times text-danger{{{ if !users.email:expired }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validation-expired]]" data-bs-toggle="tooltip"></i> <i class="expired fa fa-fw fa-times text-danger{{{ if !users.email:expired }}} hidden{{{ end }}}" title="[[admin/manage/users:users.validation-expired]]" data-bs-toggle="tooltip"></i>
<i class="notvalidated fa fa-fw fa-times text-danger{{{ if (users.email:expired || (users.email.pending || users.email:confirmed)) }}} hidden{{{ end }}}" title="[[admin/manage/users:users.not-validated]]" data-bs-toggle="tooltip"></i>
{./email} {./email}
{{{ else }}} {{{ else }}}
<i class="noemail fa fa-fw fa-nbb-none text-muted""></i> <i class="noemail fa fa-fw fa-nbb-none text-muted""></i>