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

fix: #8069, dont show hidden groups in search

Browse Source
This commit is contained in:
Baris Usakli
2019-11-29 13:35:50 -05:00
parent 33fd4a1c2b
commit c2cd7de891
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/admin/manage/groups.js
View File

@@ -101,7 +101,7 @@ define('admin/manage/groups', ['translator', 'benchpress'], function (translator
}, function (html) {
translator.translate(html, function (html) {
groupsEl.find('[data-groupname]').remove();
groupsEl.find('tr').after(html);
groupsEl.find('tbody').append(html);
});
});
});

9
src/socket.io/groups.js
View File

@@ -291,7 +291,7 @@ SocketGroups.search = async (socket, data) => {
const groupData = await groups.getGroupsBySort(data.options.sort, 0, groupsPerPage - 1);
return groupData;
}
data.options.filterHidden = data.options.filterHidden || !await user.isAdministrator(socket.uid);
return await groups.search(data.query, data.options);
};
@@ -309,6 +309,13 @@ SocketGroups.loadMore = async (socket, data) => {
SocketGroups.searchMembers = async (socket, data) => {
data.uid = socket.uid;
const [isOwner, isAdmin] = await Promise.all([
groups.ownership.isOwner(socket.uid, data.groupName),
user.isAdministrator(socket.uid),
]);
if (!isOwner && !isAdmin) {
throw new Error('[[error:no-privileges]]');
}
return await groups.searchMembers(data);
};

9
test/groups.js
View File

@@ -196,6 +196,15 @@ describe('Groups', function () {
done();
});
});
it('should not return hidden groups', async function () {
await Groups.create({
name: 'hiddenGroup',
hidden: '1',
});
const result = await socketGroups.search({ uid: testUid }, { query: 'hiddenGroup' });
assert.equal(result.length, 0);
});
});
describe('.isMember()', function () {