Skip to content

Add domain to custom list query for administrators #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RobertWowww wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add domain to custom list query for administrators #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions modules/custom_lists/custom_lists.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,18 @@ function custom_lists_content_nodes($list, $items, $full_load = TRUE) {
$query->join('taxonomy_index', 'ti', 'ti.nid = n.nid');
$query->condition('ti.tid', $list['taxonomy']);
}
if (user_access('bypass node access') || user_access('administer nodes')) {
/*
* Custom lists should show only content assigned to the current domain.
* For regular users this is fixed by domain access itself.
* Administrators see content from all domains because domain access does not enforce node viewing restrictions.
* Gemeente Zwolle asked this to be fixed for administrators as well, so domain needs to be enforced in the query.
*/
global $_domain;
$domain_id = $_domain['domain_id'];
$query->innerJoin('domain_access', 'd', 'n.nid = d.nid');
$query->condition('d.gid', $domain_id, '=');
}

// Custom filters for certain use cases.
if (!empty($list['extra-filters']) && $list['extra-filters'] != '_none') {
Expand Down