mirror of
https://github.com/silverstripe/silverstripe-subsites
synced 2024-09-27 20:06:08 +02:00
Merge branch 'pull/322'
This commit is contained in:
commit
7bf430ba83
@ -7,6 +7,7 @@ use SilverStripe\Control\HTTPRequest;
|
|||||||
use SilverStripe\Core\Manifest\ModuleLoader;
|
use SilverStripe\Core\Manifest\ModuleLoader;
|
||||||
use SilverStripe\Forms\TreeDropdownField;
|
use SilverStripe\Forms\TreeDropdownField;
|
||||||
use SilverStripe\View\Requirements;
|
use SilverStripe\View\Requirements;
|
||||||
|
use SilverStripe\Subsites\State\SubsiteState;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wraps around a TreedropdownField to add ability for temporary
|
* Wraps around a TreedropdownField to add ability for temporary
|
||||||
@ -52,14 +53,10 @@ class SubsitesTreeDropdownField extends TreeDropdownField
|
|||||||
|
|
||||||
public function tree(HTTPRequest $request)
|
public function tree(HTTPRequest $request)
|
||||||
{
|
{
|
||||||
$session = Controller::curr()->getRequest()->getSession();
|
$results = SubsiteState::singleton()->withState(function () use ($request) {
|
||||||
|
SubsiteState::singleton()->setSubsiteId($this->subsiteID);
|
||||||
$oldSubsiteID = $session->get('SubsiteID');
|
return parent::tree($request);
|
||||||
$session->set('SubsiteID', $this->subsiteID);
|
});
|
||||||
|
|
||||||
$results = parent::tree($request);
|
|
||||||
|
|
||||||
$session->set('SubsiteID', $oldSubsiteID);
|
|
||||||
|
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user