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

MINOR Removed old references from workflow in SiteTree and VirtualPage (AssignedToID and RequestedByID were old properites of a workflow page type)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66311 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2008-11-20 08:07:22 +00:00 committed by Sam Minnee
parent 29899c4396
commit 76f15e47bf
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/model/SiteTree.php
View File

@ -1315,8 +1315,6 @@ class SiteTree extends DataObject {
// Handle activities undertaken by decorators // Handle activities undertaken by decorators
$this->extend('onBeforePublish', $original); $this->extend('onBeforePublish', $original);
$this->AssignedToID = 0;
$this->RequestedByID = 0;
$this->Status = "Published"; $this->Status = "Published";
//$this->PublishedByID = Member::currentUser()->ID; //$this->PublishedByID = Member::currentUser()->ID;
$this->write(); $this->write();
@ -1358,8 +1356,6 @@ class SiteTree extends DataObject {
*/ */
function doRollbackTo($version) { function doRollbackTo($version) {
$this->publish($version, "Stage", true); $this->publish($version, "Stage", true);
$this->AssignedToID = 0;
$this->RequestedByID = 0;
$this->Status = "Saved (update)"; $this->Status = "Saved (update)";
$this->writeWithoutVersion(); $this->writeWithoutVersion();
} }
@ -1372,8 +1368,6 @@ class SiteTree extends DataObject {
// Use a clone to get the updates made by $this->publish // Use a clone to get the updates made by $this->publish
$clone = DataObject::get_by_id("SiteTree", $this->ID); $clone = DataObject::get_by_id("SiteTree", $this->ID);
$clone->AssignedToID = 0;
$clone->RequestedByID = 0;
$clone->Status = "Published"; $clone->Status = "Published";
$clone->writeWithoutVersion(); $clone->writeWithoutVersion();
} }
@ -1391,11 +1385,9 @@ class SiteTree extends DataObject {
* Changing the condition from empty($this->ID) to * Changing the condition from empty($this->ID) to
* !$this->ID && !$this->record['ID'] fixed this. * !$this->ID && !$this->record['ID'] fixed this.
*/ */
if(empty($this->ID)) if(empty($this->ID)) return true;
return true;
if(is_numeric($this->ID)) if(is_numeric($this->ID)) return false;
return false;
return stripos($this->ID, 'new') === 0; return stripos($this->ID, 'new') === 0;
} }

2
core/model/VirtualPage.php
View File

@ -28,8 +28,6 @@ class VirtualPage extends Page {
$nonVirtualFields = array( $nonVirtualFields = array(
"SecurityTypeID", "SecurityTypeID",
"OwnerID", "OwnerID",
"AssignedToID",
"RequestedByID",
"URLSegment", "URLSegment",
"Sort", "Sort",
"Status", "Status",