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

BUG Prevent missing records crashing ChangeSetItem

Browse Source
This commit is contained in:
Damian Mooyman 2016-09-30 14:10:23 +13:00
parent 92e34b7434
commit dd7d1d26af
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ORM/Versioning/ChangeSetItem.php
View File

@ -5,6 +5,7 @@ namespace SilverStripe\ORM\Versioning;
use SilverStripe\Admin\CMSPreviewable; use SilverStripe\Admin\CMSPreviewable;
use SilverStripe\Assets\Thumbnail; use SilverStripe\Assets\Thumbnail;
use SilverStripe\Control\Controller; use SilverStripe\Control\Controller;
use SilverStripe\ORM\ArrayList;
use SilverStripe\ORM\DataList; use SilverStripe\ORM\DataList;
use SilverStripe\ORM\DataObject; use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\ManyManyList; use SilverStripe\ORM\ManyManyList;
@ -109,8 +110,8 @@ class ChangeSetItem extends DataObject implements Thumbnail {
/** /**
* Get the type of change: none, created, deleted, modified, manymany * Get the type of change: none, created, deleted, modified, manymany
*
* @return string * @return string
* @throws UnexpectedDataException
*/ */
public function getChangeType() { public function getChangeType() {
if(!class_exists($this->ObjectClass)) { if(!class_exists($this->ObjectClass)) {
@ -146,7 +147,8 @@ class ChangeSetItem extends DataObject implements Thumbnail {
* Find version of this object in the given stage * Find version of this object in the given stage
* *
* @param string $stage * @param string $stage
* @return Versioned|DataObject * @return DataObject|Versioned
* @throws UnexpectedDataException
*/ */
protected function getObjectInStage($stage) { protected function getObjectInStage($stage) {
if(!class_exists($this->ObjectClass)) { if(!class_exists($this->ObjectClass)) {
@ -158,8 +160,8 @@ class ChangeSetItem extends DataObject implements Thumbnail {
/** /**
* Find latest version of this object * Find latest version of this object
* * @return DataObject|Versioned
* @return Versioned|DataObject * @throws UnexpectedDataException
*/ */
protected function getObjectLatestVersion() { protected function getObjectLatestVersion() {
if(!class_exists($this->ObjectClass)) { if(!class_exists($this->ObjectClass)) {
@ -177,15 +179,23 @@ class ChangeSetItem extends DataObject implements Thumbnail {
public function findReferenced() { public function findReferenced() {
if($this->getChangeType() === ChangeSetItem::CHANGE_DELETED) { if($this->getChangeType() === ChangeSetItem::CHANGE_DELETED) {
// If deleted from stage, need to look at live record // If deleted from stage, need to look at live record
return $this->getObjectInStage(Versioned::LIVE)->findOwners(false); $record = $this->getObjectInStage(Versioned::LIVE);
if ($record) {
return $record->findOwners(false);
}
} else { } else {
// If changed on stage, look at owned objects there // If changed on stage, look at owned objects there
return $this->getObjectInStage(Versioned::DRAFT)->findOwned()->filterByCallback(function ($owned) { $record = $this->getObjectInStage(Versioned::DRAFT);
if ($record) {
return $record->findOwned()->filterByCallback(function ($owned) {
/** @var Versioned|DataObject $owned */ /** @var Versioned|DataObject $owned */
return $owned->stagesDiffer(Versioned::DRAFT, Versioned::LIVE); return $owned->stagesDiffer(Versioned::DRAFT, Versioned::LIVE);
}); });
} }
} }
// Empty set
return new ArrayList();
}
/** /**
* Publish this item, then close it. * Publish this item, then close it.