tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-10-22 09:05:55 +00:00
Code Issues Projects Releases Wiki Activity

Better fix for #106 using DataQuery queryParams. Thanks simon_w

Browse Source
This commit is contained in:
spronkey 2013-09-12 15:23:21 +12:00
parent 586d88562c
commit 23e9cd40a0
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/extensions/SiteTreeSubsites.php
View File

@ -25,8 +25,9 @@ class SiteTreeSubsites extends DataExtension {
/** /**
* Update any requests to limit the results to the current site * Update any requests to limit the results to the current site
*/ */
function augmentSQL(SQLQuery &$query) { function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null) {
if(Subsite::$disable_subsite_filter) return; if(Subsite::$disable_subsite_filter) return;
if($dataQuery->getQueryParam('Subsite.filter') === false) return;
// Don't run on delete queries, since they are always tied to // Don't run on delete queries, since they are always tied to
// a specific ID. // a specific ID.

6
code/model/Subsite.php
View File

@ -646,12 +646,8 @@ JS;
} }
static function get_from_all_subsites($className, $filter = "", $sort = "", $join = "", $limit = "") { static function get_from_all_subsites($className, $filter = "", $sort = "", $join = "", $limit = "") {
$oldState = self::$disable_subsite_filter;
self::$disable_subsite_filter = true;
$result = DataObject::get($className, $filter, $sort, $join, $limit); $result = DataObject::get($className, $filter, $sort, $join, $limit);
// conversion to ArrayList forces immediate evaluation, respecting subsite filter setting $result = $result->setDataQueryParam('Subsite.filter', false);
$result = ArrayList::create($result->toArray());
self::$disable_subsite_filter = $oldState;
return $result; return $result;
} }