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: Let CMS users open pages deleted from draft; bug introduced by translatable.

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@75611 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-04-29 02:45:19 +00:00
parent 7e64e2e7e8
commit d33c2869a7
3 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/CMSMain.php
View File

@ -377,6 +377,12 @@ JS;
$record = DataObject::get_one( $treeClass, "`$treeClass`.ID = $id"); $record = DataObject::get_one( $treeClass, "`$treeClass`.ID = $id");
if($record) Versioned::reading_stage(null); if($record) Versioned::reading_stage(null);
} }
// Don't open a page from a different locale
if($record && Translatable::is_enabled() && $record->Locale && $record->Locale != Translatable::current_locale()) {
$record = null;
}
return $record; return $record;
} else if(substr($id,0,3) == 'new') { } else if(substr($id,0,3) == 'new') {

19
code/LeftAndMain.php
View File

@ -451,7 +451,7 @@ class LeftAndMain extends Controller {
public function getRecord($id, $className = null) { public function getRecord($id, $className = null) {
if(!$className) $className = $this->stat('tree_class'); if(!$className) $className = $this->stat('tree_class');
return DataObject::get_by_id($className, $rootID); return DataObject::get_by_id($className, $id);
} }
function getSiteTreeFor($className, $rootID = null) { function getSiteTreeFor($className, $rootID = null) {
@ -844,12 +844,7 @@ JS;
} }
public function EditForm() { public function EditForm() {
if(isset($_REQUEST['ID']) && is_numeric($_REQUEST['ID'])) { $record = $this->currentPage();
$record = DataObject::get_by_id($this->stat('tree_class'), $_REQUEST['ID']);
} else {
$record = $this->CurrentPage();
}
if(!$record) return false; if(!$record) return false;
if($record && !$record->canView()) return Security::permissionFailure($this); if($record && !$record->canView()) return Security::permissionFailure($this);
@ -899,15 +894,7 @@ JS;
} }
public function currentPage() { public function currentPage() {
$id = $this->currentPageID(); return $this->getRecord($this->currentPageID());
if($id && is_numeric($id)) {
$page = DataObject::get_by_id($this->stat('tree_class'), $id);
if($page && Translatable::is_enabled() && $page->Locale && $page->Locale != Translatable::current_locale()) {
return false;
} else {
return $page;
}
}
} }
public function isCurrentPage(DataObject $page) { public function isCurrentPage(DataObject $page) {

46
tests/CMSMainTest.php
View File

@ -1,6 +1,6 @@
<?php <?php
class CMSMainTest extends SapphireTest { class CMSMainTest extends FunctionalTest {
static $fixture_file = 'cms/tests/CMSMainTest.yml'; static $fixture_file = 'cms/tests/CMSMainTest.yml';
/** /**
@ -82,4 +82,48 @@ class CMSMainTest extends SapphireTest {
$this->assertTrue($page->getCMSFields(null) instanceof FieldSet); $this->assertTrue($page->getCMSFields(null) instanceof FieldSet);
} }
} }
/**
* Test that a draft-deleted page can still be opened in the CMS
*/
function testDraftDeletedPageCanBeOpenedInCMS() {
// Set up a page that is delete from live
$page = $this->objFromFixture('Page','page1');
$pageID = $page->ID;
$page->doPublish();
$page->delete();
$this->session()->inst_set('loggedInAs', $this->idFromFixture('Member', 'admin'));
$response = $this->get('admin/getitem?ID=' . $pageID . '&ajax=1');
// Check that the 'delete from live' button exists as a simple way of checking that the correct page is returned.
$this->assertRegExp('/<input[^>]+type="submit"[^>]+name="action_deletefromlive"/i', $response->getBody());
}
/**
* Test CMSMain::getRecord()
*/
function testGetRecord() {
// Set up a page that is delete from live
$page1 = $this->objFromFixture('Page','page1');
$page1ID = $page1->ID;
$page1->doPublish();
$page1->delete();
$cmsMain = new CMSMain();
// Bad calls
$this->assertNull($cmsMain->getRecord('0'));
$this->assertNull($cmsMain->getRecord('asdf'));
// Pages that are on draft and aren't on draft should both work
$this->assertType('Page', $cmsMain->getRecord($page1ID));
$this->assertType('Page', $cmsMain->getRecord($this->idFromFixture('Page','page2')));
// This functionality isn't actually used any more.
$newPage = $cmsMain->getRecord('new-Page-5');
$this->assertType('Page', $newPage);
$this->assertEquals('5', $newPage->ParentID);
}
} }