tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-25 22:19:42 +02:00
Code Issues Projects Releases Wiki Activity

BUG Fix regressions in CMS from db field changes

Browse Source
This commit is contained in:
Damian Mooyman 2015-09-28 17:22:44 +13:00
parent 60e75cbd99
commit 8e3f549b19
3 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
code/model/VirtualPage.php
View File

@ -16,6 +16,8 @@ class VirtualPage extends Page {
* Note that anything in {@link self::config()->initially_copied_fields} is implicitly included in this list.
*/
private static $non_virtual_fields = array(
"ID",
"ClassName",
"SecurityTypeID",
"OwnerID",
"URLSegment",
@ -53,26 +55,30 @@ class VirtualPage extends Page {
$nonVirtualFields = array_merge(self::config()->non_virtual_fields, self::config()->initially_copied_fields);
$record = $this->CopyContentFrom();
$allFields = $record->db();
if($hasOne = $record->hasOne()) foreach($hasOne as $link) $allFields[$link . 'ID'] = "Int";
$virtualFields = array();
foreach($allFields as $field => $type) {
if(!in_array($field, $nonVirtualFields)) $virtualFields[] = $field;
foreach($record->db() as $field => $type) {
if(!in_array($field, $nonVirtualFields)) {
$virtualFields[] = $field;
}
}
return $virtualFields;
}
/**
* @return SiteTree Returns the linked page, or failing that, a new object.
* Returns the linked page, or failing that, a new object.
*
* Always returns a non-empty object
*
* @return SiteTree
*/
public function CopyContentFrom() {
$copyContentFromID = $this->CopyContentFromID;
if(!$copyContentFromID) return new SiteTree();
if(!$copyContentFromID) {
return new SiteTree();
}
if(!isset($this->components['CopyContentFrom'])) {
$this->components['CopyContentFrom'] = DataObject::get_by_id("SiteTree",
$copyContentFromID);
$this->components['CopyContentFrom'] = DataObject::get_by_id("SiteTree", $copyContentFromID);
// Don't let VirtualPages point to other VirtualPages
if($this->components['CopyContentFrom'] instanceof VirtualPage) {
@ -87,8 +93,11 @@ class VirtualPage extends Page {
return $this->components['CopyContentFrom'] ? $this->components['CopyContentFrom'] : new SiteTree();
}
public function setCopyContentFromID($val) {
if($val && DataObject::get_by_id('SiteTree', $val) instanceof VirtualPage) $val = 0;
if($val && DataObject::get_by_id('SiteTree', $val) instanceof VirtualPage) {
$val = 0;
}
return $this->setField("CopyContentFromID", $val);
}
@ -440,13 +449,10 @@ class VirtualPage extends Page {
* @return bool
*/
public function hasField($field) {
return (
array_key_exists($field, $this->record)
|| $this->hasDatabaseField($field)
|| array_key_exists($field, $this->db()) // Needed for composite fields
|| parent::hasMethod("get{$field}")
|| $this->CopyContentFrom()->hasField($field)
);
if(parent::hasField($field)) {
return true;
}
return $this->CopyContentFrom()->hasField($field);
}
/**
* Overwrite to also check for method on the original data object
@ -455,8 +461,10 @@ class VirtualPage extends Page {
* @return bool
*/
public function hasMethod($method) {
if(parent::hasMethod($method)) return true;
return $this->copyContentFrom()->hasMethod($method);
if(parent::hasMethod($method)) {
return true;
}
return $this->CopyContentFrom()->hasMethod($method);
}
/**
@ -467,11 +475,9 @@ class VirtualPage extends Page {
* @return string
*/
public function castingHelper($field) {
if($this->copyContentFrom()) {
return $this->copyContentFrom()->castingHelper($field);
} else {
return parent::castingHelper($field);
}
return $this
->CopyContentFrom()
->castingHelper($field);
}
}

6
tests/model/VirtualPageTest.php
View File

@ -6,8 +6,12 @@ class VirtualPageTest extends SapphireTest {
protected $extraDataObjects = array(
'VirtualPageTest_ClassA',
'VirtualPageTest_ClassB',
'VirtualPageTest_ClassC',
'VirtualPageTest_NotRoot',
'VirtualPageTest_PageExtension',
'VirtualPageTest_PageWithAllowedChildren',
'VirtualPageTest_TestDBField',
'VirtualPageTest_VirtualPageSub',
'VirtualPageTest_PageWithAllowedChildren'
);
protected $illegalExtensions = array(

31
tests/model/VirtualPageTest.yml
View File

@ -1,17 +1,18 @@
Page:
master:
Title: My Page
MenuTitle: My Page Nav
master2:
Title: My Other Page
MenuTitle: My Other Page Nav
holder:
Title: Sub-pages
master:
Title: My Page
MenuTitle: My Page Nav
master2:
Title: My Other Page
MenuTitle: My Other Page Nav
holder:
Title: Sub-pages
VirtualPage:
vp1:
CopyContentFrom: =>Page.master
Parent: =>Page.holder
vp2:
CopyContentFrom: =>Page.master
Parent: =>Page.holder
vp1:
Title: vp1
CopyContentFrom: =>Page.master
Parent: =>Page.holder
vp2:
Title: vp2
CopyContentFrom: =>Page.master
Parent: =>Page.holder