FIX Subsites virtual pages now allow you to re-save them when used in conjunction with silverstripe-fluent
This commit is contained in:
parent
d1fc84d15c
commit
1f51fcd909
|
@ -8,7 +8,6 @@ use SilverStripe\CMS\Model\VirtualPage;
|
||||||
use SilverStripe\Control\Controller;
|
use SilverStripe\Control\Controller;
|
||||||
use SilverStripe\Core\Config\Config;
|
use SilverStripe\Core\Config\Config;
|
||||||
use SilverStripe\Forms\DropdownField;
|
use SilverStripe\Forms\DropdownField;
|
||||||
use SilverStripe\Forms\LabelField;
|
|
||||||
use SilverStripe\Forms\LiteralField;
|
use SilverStripe\Forms\LiteralField;
|
||||||
use SilverStripe\Forms\TextareaField;
|
use SilverStripe\Forms\TextareaField;
|
||||||
use SilverStripe\Forms\TextField;
|
use SilverStripe\Forms\TextField;
|
||||||
|
@ -223,33 +222,25 @@ class SubsitesVirtualPage extends VirtualPage
|
||||||
{
|
{
|
||||||
$isValid = parent::validURLSegment();
|
$isValid = parent::validURLSegment();
|
||||||
|
|
||||||
|
$filters = [
|
||||||
|
'URLSegment' => $this->URLSegment,
|
||||||
|
];
|
||||||
|
|
||||||
// Veto the validation rules if its false. In this case, some logic
|
// Veto the validation rules if its false. In this case, some logic
|
||||||
// needs to be duplicated from parent to find out the exact reason the validation failed.
|
// needs to be duplicated from parent to find out the exact reason the validation failed.
|
||||||
if (!$isValid) {
|
if (!$isValid) {
|
||||||
$IDFilter = $this->ID ? "AND \"SiteTree\".\"ID\" <> $this->ID" : null;
|
// Exclude the current page from the filter
|
||||||
$parentFilter = null;
|
$filters['ID:not'] = $this->ID;
|
||||||
|
|
||||||
if (Config::inst()->get(SiteTree::class, 'nested_urls')) {
|
if (Config::inst()->get(SiteTree::class, 'nested_urls')) {
|
||||||
if ($this->ParentID) {
|
$filters['ParentID'] = $this->ParentID ?: 0;
|
||||||
$parentFilter = " AND \"SiteTree\".\"ParentID\" = $this->ParentID";
|
|
||||||
} else {
|
|
||||||
$parentFilter = ' AND "SiteTree"."ParentID" = 0';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
|
$origDisableSubsiteFilter = Subsite::$disable_subsite_filter;
|
||||||
Subsite::$disable_subsite_filter = true;
|
Subsite::disable_subsite_filter();
|
||||||
$existingPage = DataObject::get_one(
|
$existingPage = SiteTree::get()->filter($filters)->first();
|
||||||
SiteTree::class,
|
Subsite::disable_subsite_filter($origDisableSubsiteFilter);
|
||||||
"\"URLSegment\" = '$this->URLSegment' $IDFilter $parentFilter",
|
$existingPageInSubsite = SiteTree::get()->filter($filters)->first();
|
||||||
false // disable cache, it doesn't include subsite status in the key
|
|
||||||
);
|
|
||||||
Subsite::$disable_subsite_filter = $origDisableSubsiteFilter;
|
|
||||||
$existingPageInSubsite = DataObject::get_one(
|
|
||||||
SiteTree::class,
|
|
||||||
"\"URLSegment\" = '$this->URLSegment' $IDFilter $parentFilter",
|
|
||||||
false // disable cache, it doesn't include subsite status in the key
|
|
||||||
);
|
|
||||||
|
|
||||||
// If URL has been vetoed because of an existing page,
|
// If URL has been vetoed because of an existing page,
|
||||||
// be more specific and allow same URLSegments in different subsites
|
// be more specific and allow same URLSegments in different subsites
|
||||||
|
|
Loading…
Reference in New Issue