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

showing temporary ban indicator in Users ACP, #4807

Browse Source
This commit is contained in:
Julian Lam
2016-07-05 11:07:31 -04:00
parent ad9229fec2
commit a2b0576b79
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/user/data.js
View File

@@ -55,6 +55,16 @@ module.exports = function(User) {
return callback(err);
}
if (fields.indexOf('banned') !== -1) {
// Also retrieve ban expiry for these users
db.sortedSetScores('users:banned:expire', uids, function(err, scores) {
users = users.map(function(userObj, idx) {
userObj.banned_until = scores[idx] || 0;
userObj.banned_until_readable = scores[idx] ? new Date(scores[idx]).toISOString() : 'Not Banned';
});
});
}
modifyUserData(users, fieldsToRemove, callback);
});
};

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

@@ -72,7 +72,7 @@
<!-- ENDIF !users.email:confirmed -->
<!-- ENDIF config.requireEmailConfirmation -->
<span class="administrator label label-primary <!-- IF !users.administrator -->hide<!-- ENDIF !users.administrator -->">Admin</span>
<span class="ban label label-danger <!-- IF !users.banned -->hide<!-- ENDIF !users.banned -->">Banned</span>
<span class="ban label label-danger <!-- IF !users.banned -->hide<!-- ENDIF !users.banned -->">Banned<!-- IF users.banned_until --> <i class="fa fa-clock-o" title="Banned until {../banned_until_readable}"></i><!-- ENDIF users.banned_until --></span>
</div>
</div>