From 44e3966d9615a2cdea27395fcaccde90bdc15cb9 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 03:16:42 +0000 Subject: [PATCH] ENHANCEMENT Removed manual SiteTree->Status setting in LeftAndMain controllers, use specific getters like SiteTree->IsAddedToStage for this purpose git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92745 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 2 -- code/LeftAndMain.php | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 896ea717..d1a6e26d 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -318,8 +318,6 @@ JS; if($record && !$record->canView()) return Security::permissionFailure($this); if($record) { - if($record->IsDeletedFromStage) $record->Status = _t('CMSMain.REMOVEDFD',"Removed from the draft site"); - $fields = $record->getCMSFields($this); if ($fields == null) { user_error("getCMSFields returned null on a '".get_class($record)."' object - it should return a FieldSet object. Perhaps you forgot to put a return statement at the end of your method?", E_USER_ERROR); diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 82fa8e9b..89eee9e2 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -546,15 +546,12 @@ class LeftAndMain extends Controller { $record = $this->getNewItem($SQL_id, false); } + // TODO Coupling to SiteTree $record->HasBrokenLink = 0; $record->HasBrokenFile = 0; $record->writeWithoutVersion(); - if(is_a($record, "Page")) { - $record->Status = ($record->Status == "New page" || $record->Status == "Saved (new)") ? "Saved (new)" : "Saved (update)"; - } - // Update the class instance if necessary if($data['ClassName'] != $record->ClassName) { $newClassName = $record->ClassName; @@ -710,7 +707,6 @@ JS; if($node && !$node->canEdit()) return Security::permissionFailure($this); $node->ParentID = $parentID; - $node->Status = "Saved (update)"; $node->write(); $statusUpdates['modified'][$node->ID] = array( @@ -763,7 +759,6 @@ JS; foreach($request->requestVar('ID') as $id) { if($id == $movedNode->ID) { $movedNode->Sort = ++$counter; - $movedNode->Status = "Saved (update)"; $movedNode->write(); $statusUpdates['modified'][$movedNode->ID] = array( 'TreeTitle'=>$movedNode->TreeTitle