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 branch '3.6.0' into 3.6

Browse Source
This commit is contained in:
Daniel Hensby 2017-05-08 16:24:04 +01:00
commit db7b1b9bd6
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/controllers/CMSMain.php
View File

@ -627,23 +627,25 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
} }
/** /**
* @param int $id * @param int|SiteTree $idOrRecord ID of record or record instance
* @param FieldList $fields * @param FieldList $fields
* @return CMSForm * @return CMSForm
*/ */
public function getEditForm($id = null, $fields = null) { public function getEditForm($idOrRecord = null, $fields = null) {
if(!$idOrRecord) {
if(!$id) $id = $this->currentPageID(); $idOrRecord = $this->currentPageID();
$form = parent::getEditForm($id); }
$form = parent::getEditForm($idOrRecord);
// TODO Duplicate record fetching (see parent implementation) // TODO Duplicate record fetching (see parent implementation)
$record = $this->getRecord($id); $record = $this->getRecord($idOrRecord);
if($record && !$record->canView()) return Security::permissionFailure($this); if($record && !$record->canView()) return Security::permissionFailure($this);
if(!$fields) $fields = $form->Fields(); if(!$fields) $fields = $form->Fields();
$actions = $form->Actions(); $actions = $form->Actions();
if($record) { if($record) {
$id = $record->ID;
$deletedFromStage = $record->getIsDeletedFromStage(); $deletedFromStage = $record->getIsDeletedFromStage();
$deleteFromLive = !$record->getExistsOnLive(); $deleteFromLive = !$record->getExistsOnLive();
@ -733,7 +735,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$this->extend('updateEditForm', $form); $this->extend('updateEditForm', $form);
return $form; return $form;
} else if($id) { } else if($idOrRecord) {
$form = CMSForm::create( $this, "EditForm", new FieldList( $form = CMSForm::create( $this, "EditForm", new FieldList(
new LabelField('PageDoesntExistLabel',_t('CMSMain.PAGENOTEXISTS',"This page doesn't exist"))), new FieldList() new LabelField('PageDoesntExistLabel',_t('CMSMain.PAGENOTEXISTS',"This page doesn't exist"))), new FieldList()
)->setHTMLID('Form_EditForm'); )->setHTMLID('Form_EditForm');
@ -917,6 +919,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
public function setCurrentPageID($id) { public function setCurrentPageID($id) {
$id = (int)$id; $id = (int)$id;
$this->pageID = $id; $this->pageID = $id;
parent::setCurrentPageID($id);
} }
/** /**
@ -925,7 +928,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
* @return int * @return int
*/ */
public function currentPageID() { public function currentPageID() {
$id = $this->pageID; $id = $this->pageID ?: parent::currentPageID();
$this->extend('updateCurrentPageID', $id); $this->extend('updateCurrentPageID', $id);

6
tests/model/SiteTreeTest.php
View File

@ -770,19 +770,19 @@ class SiteTreeTest extends SapphireTest {
array('pagetype' => $sitetree->i18n_singular_name()) array('pagetype' => $sitetree->i18n_singular_name())
); );
$sitetree->write(); $sitetree->write();
$this->assertEquals($sitetree->URLSegment, 'neue-seite', $this->assertEquals('neue-site-tree', $sitetree->URLSegment,
'Sets based on default title on first save' 'Sets based on default title on first save'
); );
$sitetree->Title = 'Changed'; $sitetree->Title = 'Changed';
$sitetree->write(); $sitetree->write();
$this->assertEquals($sitetree->URLSegment, 'changed', $this->assertEquals('changed', $sitetree->URLSegment,
'Auto-updates when set to default title' 'Auto-updates when set to default title'
); );
$sitetree->Title = 'Changed again'; $sitetree->Title = 'Changed again';
$sitetree->write(); $sitetree->write();
$this->assertEquals($sitetree->URLSegment, 'changed', $this->assertEquals('changed', $sitetree->URLSegment,
'Does not auto-update once title has been changed' 'Does not auto-update once title has been changed'
); );