tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2879 from creative-commoners/pulls/4.13/deppage-non-sitetree-items

Browse Source 
FIX SiteTree::DependentPages method returns non-SiteTree instance
This commit is contained in:
Guy Sartorelli 2023-09-01 11:12:59 +12:00 committed by GitHub
commit 90e30994ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/Model/SiteTree.php
View File

@ -2612,8 +2612,10 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi
// Need to update pages linking to this one as no longer broken
foreach ($stageSelf->DependentPages() as $page) {
/** @var SiteTree $page */
$page->writeWithoutVersion();
if ($page->hasExtension(Versioned::class)) {
/** @var Versioned $page */
$page->writeWithoutVersion();
}
}
}

21
tests/php/Model/SiteTreeTest.php
View File

@ -12,6 +12,7 @@ use SilverStripe\CMS\Model\VirtualPage;
use SilverStripe\CMS\Tests\Controllers\SiteTreeTest_NamespaceMapTestController;
use SilverStripe\CMS\Tests\CMSEditLinkExtensionTest\BelongsToPage;
use SilverStripe\CMS\Tests\CMSEditLinkExtensionTest\PageWithChild;
use SilverStripe\CMS\Tests\Model\SiteTreeBrokenLinksTest\NotPageObject;
use SilverStripe\CMS\Tests\Page\SiteTreeTest_NamespaceMapTest;
use SilverStripe\Control\ContentNegotiator;
use SilverStripe\Control\Controller;
@ -69,6 +70,7 @@ class SiteTreeTest extends SapphireTest
SiteTreeTest_DataObject::class,
PageWithChild::class,
BelongsToPage::class,
NotPageObject::class,
];
public function reservedSegmentsProvider()
@ -2119,4 +2121,23 @@ class SiteTreeTest extends SapphireTest
]
];
}
public function testOnAfterRevertToLive()
{
// Create new page and publish it
$page = SiteTree::create();
$page->Content = 'Test content';
$id = $page->write();
$page->publishRecursive();
// Add link to non-page object
/** @var NotPageObject $obj */
$obj = $this->objFromFixture(NotPageObject::class, 'object1');
$obj->Content = '<a href="[sitetree_link,id='. $id .']">Link to Page</a>';
$obj->write();
//Test that method doesn't throw exception
$this->expectNotToPerformAssertions();
$page->onAfterRevertToLive();
}
}

4
tests/php/Model/SiteTreeTest.yml
View File

@ -128,3 +128,7 @@ SilverStripe\CMS\Tests\Model\SiteTreeTest_DataObject:
relations:
Title: 'Linked DataObject'
Pages: =>Page.home,=>Page.about,=>Page.staff
SilverStripe\CMS\Tests\Model\SiteTreeBrokenLinksTest\NotPageObject:
object1:
Content: 'Everything will be ok'