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

BUGFIX: Fixed viewing of deleted pages. (from r89833)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@96795 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-01-13 00:02:06 +00:00
parent b7181a832f
commit 27f3dfc6ed
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/CMSSiteTreeFilter.php
View File

@ -79,7 +79,7 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
} }
function getTree() { function getTree() {
$leftAndMain = new LeftAndMain(); $leftAndMain = new CMSMain();
$tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, "AllHistoricalChildren"); $tree = $leftAndMain->getSiteTreeFor('SiteTree', isset($_REQUEST['ID']) ? $_REQUEST['ID'] : 0, "AllHistoricalChildren");
// Trim off the outer tag // Trim off the outer tag

9
tests/CMSMainTest.php
View File

@ -36,7 +36,7 @@ class CMSMainTest extends FunctionalTest {
$response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session()); $response = Director::test("admin/cms/publishall", array('confirm' => 1), $this->session());
$this->assertContains( $this->assertContains(
sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 5), sprintf(_t('CMSMain.PUBPAGES',"Done: Published %d pages"), 7),
$response->getBody() $response->getBody()
); );
@ -156,4 +156,11 @@ class CMSMainTest extends FunctionalTest {
$this->assertEquals('5', $newPage->ParentID); $this->assertEquals('5', $newPage->ParentID);
} }
function testDeletedPagesSiteTreeFilter() {
$id = $this->idFromFixture('Page', 'page3');
$this->logInWithPermssion('ADMIN');
$result = $this->get('admin/getfilteredsubtree?filter=CMSSiteTreeFilter_DeletedPages&ajax=1&ID=' . $id);
$this->assertEquals(200, $result->getStatusCode());
}
} }

10
tests/CMSMainTest.yml
View File

@ -4,9 +4,15 @@ Page:
page2: page2:
Title: Page 2 Title: Page 2
page3: page3:
Title: Page 2 Title: Page 3
page31:
Title: Page 3.1
Parent: =>Page.page3
page32:
Title: Page 3.2
Parent: =>Page.page3
page4: page4:
Title: Page 2 Title: Page 4
home: home:
Title: Home Title: Home
URLSegment: home URLSegment: home