tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-18 10:41:40 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'pull/322'

Browse Source
This commit is contained in:
Daniel Hensby 2017-10-11 16:16:47 +01:00
commit 7bf430ba83
No known key found for this signature in database
GPG Key ID: 5DE415D786BBB2FD
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Forms/SubsitesTreeDropdownField.php
View File

@ -7,6 +7,7 @@ use SilverStripe\Control\HTTPRequest;
use SilverStripe\Core\Manifest\ModuleLoader;
use SilverStripe\Forms\TreeDropdownField;
use SilverStripe\View\Requirements;
use SilverStripe\Subsites\State\SubsiteState;
/**
* Wraps around a TreedropdownField to add ability for temporary
@ -52,14 +53,10 @@ class SubsitesTreeDropdownField extends TreeDropdownField
public function tree(HTTPRequest $request)
{
$session = Controller::curr()->getRequest()->getSession();
$oldSubsiteID = $session->get('SubsiteID');
$session->set('SubsiteID', $this->subsiteID);
$results = parent::tree($request);
$session->set('SubsiteID', $oldSubsiteID);
$results = SubsiteState::singleton()->withState(function () use ($request) {
SubsiteState::singleton()->setSubsiteId($this->subsiteID);
return parent::tree($request);
});
return $results;
}