tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-28 15:39:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.2' into 4.3

Browse Source
This commit is contained in:
Robbie Averill 2019-02-06 22:24:53 +03:00
commit 23ae682b35
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/Model/SiteTree.php
View File

@ -65,6 +65,7 @@ use SilverStripe\Security\PermissionChecker;
use SilverStripe\Security\PermissionProvider; use SilverStripe\Security\PermissionProvider;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Subsites\Model\Subsite;
use SilverStripe\Versioned\RecursivePublishable; use SilverStripe\Versioned\RecursivePublishable;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
use SilverStripe\View\ArrayData; use SilverStripe\View\ArrayData;
@ -72,7 +73,6 @@ use SilverStripe\View\HTML;
use SilverStripe\View\Parsers\ShortcodeParser; use SilverStripe\View\Parsers\ShortcodeParser;
use SilverStripe\View\Parsers\URLSegmentFilter; use SilverStripe\View\Parsers\URLSegmentFilter;
use SilverStripe\View\SSViewer; use SilverStripe\View\SSViewer;
use Subsite;
/** /**
* Basic data-object representing all pages within the site tree. All page types that live within the hierarchy should * Basic data-object representing all pages within the site tree. All page types that live within the hierarchy should
@ -1773,7 +1773,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
*/ */
public function DependentPages($includeVirtuals = true) public function DependentPages($includeVirtuals = true)
{ {
if (class_exists('Subsite')) { if (class_exists(Subsite::class)) {
$origDisableSubsiteFilter = Subsite::$disable_subsite_filter; $origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
Subsite::disable_subsite_filter(true); Subsite::disable_subsite_filter(true);
} }
@ -1809,7 +1809,7 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
}); });
$items->merge($redirectors); $items->merge($redirectors);
if (class_exists('Subsite')) { if (class_exists(Subsite::class)) {
Subsite::disable_subsite_filter($origDisableSubsiteFilter); Subsite::disable_subsite_filter($origDisableSubsiteFilter);
} }
@ -1828,9 +1828,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
// Disable subsite filter for these pages // Disable subsite filter for these pages
if ($pages instanceof DataList) { if ($pages instanceof DataList) {
return $pages->setDataQueryParam('Subsite.filter', false); return $pages->setDataQueryParam('Subsite.filter', false);
} else {
return $pages;
} }
return $pages;
} }
/** /**
@ -1898,8 +1897,8 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
'Title' => $this->fieldLabel('Title'), 'Title' => $this->fieldLabel('Title'),
'DependentLinkType' => _t(__CLASS__.'.DependtPageColumnLinkType', 'Link type'), 'DependentLinkType' => _t(__CLASS__.'.DependtPageColumnLinkType', 'Link type'),
); );
if (class_exists('Subsite')) { if (class_exists(Subsite::class)) {
$dependentColumns['Subsite.Title'] = singleton('Subsite')->i18n_singular_name(); $dependentColumns['Subsite.Title'] = Subsite::singleton()->i18n_singular_name();
} }
$dependentNote = new LiteralField('DependentNote', '<p>' . _t(__CLASS__.'.DEPENDENT_NOTE', 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.') . '</p>'); $dependentNote = new LiteralField('DependentNote', '<p>' . _t(__CLASS__.'.DEPENDENT_NOTE', 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.') . '</p>');

9
tests/php/Model/SiteTreePermissionsTest.php
View File

@ -10,6 +10,7 @@ use SilverStripe\Security\Group;
use SilverStripe\Security\Member; use SilverStripe\Security\Member;
use SilverStripe\Security\Security; use SilverStripe\Security\Security;
use SilverStripe\SiteConfig\SiteConfig; use SilverStripe\SiteConfig\SiteConfig;
use SilverStripe\Subsites\Extensions\SiteTreeSubsites;
use SilverStripe\Versioned\Versioned; use SilverStripe\Versioned\Versioned;
/** /**
@ -20,11 +21,11 @@ class SiteTreePermissionsTest extends FunctionalTest
{ {
protected static $fixture_file = "SiteTreePermissionsTest.yml"; protected static $fixture_file = "SiteTreePermissionsTest.yml";
protected static $illegal_extensions = array( protected static $illegal_extensions = [
SiteTree::class => array('SiteTreeSubsites') SiteTree::class => [SiteTreeSubsites::class],
); ];
public function setUp() protected function setUp()
{ {
parent::setUp(); parent::setUp();