BUGFIX #6291 Remove rollback action from CMSMain allowed_actions and …

…rely on form action_rollback instead which is safer git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@115440 467b73ca-7a2a-4603-9d3b-597d59a354a9
silverstripe · Feb 2, 2011 · 27aad3d · 27aad3d
1 parent 3b6a957
commit 27aad3d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/code/CMSMain.php b/code/CMSMain.php
@@ -52,7 +52,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 		'getshowdeletedsubtree',
 		'getfilteredsubtree',
 		'batchactions',
-		'rollback', // see http://open.silverstripe.org/ticket/6291
 	);
 
 	/**
@@ -390,11 +389,15 @@ function save_siteconfig($data, $form) {
 	 * Get a database record to be managed by the CMS
 	 */
  	public function getRecord($id) {
-
 		$treeClass = $this->stat('tree_class');
 
 		if($id && is_numeric($id)) {
-			$record = DataObject::get_one( $treeClass, "\"$treeClass\".\"ID\" = $id");
+			$version = isset($_REQUEST['Version']) ? $_REQUEST['Version'] : null;
+			if(is_numeric($version)) {
+				$record = Versioned::get_version($treeClass, $id, $version);
+			} else {
+				$record = DataObject::get_one($treeClass, "\"$treeClass\".\"ID\" = $id");
+			}
 
 			// Then, try getting a record from the live site
 			if(!$record) {
@@ -902,10 +905,7 @@ function getversion() {
 				'Root'
 			);
 
-			$actions = new FieldSet(
+			$actions = $record->getCMSActions();
-				new FormAction("email", _t('CMSMain.EMAIL',"Email")),
-				new FormAction("rollback", _t('CMSMain.ROLLBACK',"Roll back to this version"))
-			);
 
 			// encode the message to appear in the body of the email
 			$archiveURL = Director::absoluteBaseURL() . $record->URLSegment . '?archiveDate=' . $record->obj('LastEdited')->URLDatetime();

diff --git a/tests/CMSMainTest.php b/tests/CMSMainTest.php
@@ -186,9 +186,22 @@ function testGetRecord() {
 		$newPage = $cmsMain->getRecord('new-Page-5');
 		$this->assertType('Page', $newPage);
 		$this->assertEquals('5', $newPage->ParentID);
+	}
 
+	function testGetVersionRecord() {
+		$cmsMain = new CMSMain();
+		$page1 = $this->objFromFixture('Page', 'page1');
+		$page1->Content = 'this is the old content';
+		$page1->write();
+		$page1->Content = 'this is new content (new version)';
+		$page1->write();
+		$versionID = DB::query('SELECT "Version" FROM "SiteTree_versions" WHERE "Content" = \'this is the old content\'')->value();
+		$_REQUEST['Version'] = $versionID;
+		$this->assertEquals($cmsMain->getRecord($page1->ID)->Version, $versionID);
+		$this->assertEquals($cmsMain->getRecord($page1->ID)->Content, 'this is the old content');
+		unset($_REQUEST['Version']);
 	}
-	
+
 	function testDeletedPagesSiteTreeFilter() {
 		$id = $this->idFromFixture('Page', 'page3');
 		$this->logInWithPermission('ADMIN');