diff --git a/src/server/tools/general.js b/src/server/tools/general.js index 089997c..c2b50f4 100755 --- a/src/server/tools/general.js +++ b/src/server/tools/general.js @@ -1036,8 +1036,6 @@ module.exports = { await this.sendNotifGroupByUsername(cmd, idapp, usernameOrig, usernameOrig, username_action, groupname, false); } - - } catch (e) { console.error('e', e); } @@ -1769,10 +1767,15 @@ module.exports = { } } + let filteradmin = false; if (params.filtercustom) { let condition = {}; for (const myfilter of params.filtercustom) { + if (!!myfilter.admins) { + filteradmin = true; + } + if (myfilter['pub_to_share'] === shared_consts.PUBTOSHARE.ONLY_GROUPS_FOLLOW) { let arraygroups = []; @@ -1854,13 +1857,30 @@ module.exports = { } } + if (params.table === 'mygroups') { + // BINARY CHECK (?): const filter = [{ visibility: { $bitsAnyClear: [1] } }]; + // if (!User.isAdmin(req.user.perm)) { + // not Visibility_Group.HIDDEN + if (true && !filteradmin) { + const filter = [ + { + visibility: { + $nin: [shared_consts.Visibility_Group.HIDDEN] + }, + }, + ]; + query.push({$match: {$and: filter}}); + } + // } + } + } else { // VECCHIA VERSIONE const q1 = this.getLookup(params, 1); if (q1) query = [...query, ...q1]; } - query.push( + query.push ( { $group: { _id: null,