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

fix: #8681 change owner modal's search should check if user is banned

Browse Source
This commit is contained in:
psychobunny
2020-09-25 14:47:22 -04:00
parent 611f3c6155
commit b6f2f0e5d0
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/topic/change-owner.js
View File

@@ -37,7 +37,7 @@ define('forum/topic/change-owner', [
changeOwner(); changeOwner();
}); });
autocomplete.user(modal.find('#username'), function (ev, ui) { autocomplete.user(modal.find('#username'), { notBanned: true }, function (ev, ui) {
toUid = ui.item.user.uid; toUid = ui.item.user.uid;
checkButtonEnable(); checkButtonEnable();
}); });

1
src/socket.io/user/search.js
View File

@@ -24,6 +24,7 @@ module.exports = function (SocketUser) {
sortBy: data.sortBy, sortBy: data.sortBy,
onlineOnly: data.onlineOnly, onlineOnly: data.onlineOnly,
bannedOnly: data.bannedOnly, bannedOnly: data.bannedOnly,
notBanned: data.notBanned,
flaggedOnly: data.flaggedOnly, flaggedOnly: data.flaggedOnly,
paginate: data.paginate, paginate: data.paginate,
uid: socket.uid, uid: socket.uid,

6
src/user/search.js
View File

@@ -78,7 +78,7 @@ module.exports = function (User) {
if (data.onlineOnly) { if (data.onlineOnly) {
fields.push('status', 'lastonline'); fields.push('status', 'lastonline');
} }
if (data.bannedOnly) { if (data.bannedOnly || data.notBanned) {
fields.push('banned'); fields.push('banned');
} }
if (data.flaggedOnly) { if (data.flaggedOnly) {
@@ -104,6 +104,10 @@ module.exports = function (User) {
userData = userData.filter(user => user.banned); userData = userData.filter(user => user.banned);
} }
if (data.notBanned) {
userData = userData.filter(user => !user.banned);
}
if (data.flaggedOnly) { if (data.flaggedOnly) {
userData = userData.filter(user => parseInt(user.flags, 10) > 0); userData = userData.filter(user => parseInt(user.flags, 10) > 0);
} }