mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-10 16:05:49 +01:00
showing temporary ban indicator in Users ACP, #4807
This commit is contained in:
@@ -55,6 +55,16 @@ module.exports = function(User) {
|
|||||||
return callback(err);
|
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);
|
modifyUserData(users, fieldsToRemove, callback);
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -72,7 +72,7 @@
|
|||||||
<!-- ENDIF !users.email:confirmed -->
|
<!-- ENDIF !users.email:confirmed -->
|
||||||
<!-- ENDIF config.requireEmailConfirmation -->
|
<!-- ENDIF config.requireEmailConfirmation -->
|
||||||
<span class="administrator label label-primary <!-- IF !users.administrator -->hide<!-- ENDIF !users.administrator -->">Admin</span>
|
<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>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user