MINOR Using new PjaxResponseNegotiator in CMSMain

silverstripe · Apr 5, 2012 · a6c586a · a6c586a
1 parent 3341a18
commit a6c586a
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php
@@ -591,20 +591,12 @@ public function save($data, $form) {
 					$record->Title
 				)
 			);
-
-			// Reload form, data and actions might have changed
-			$form = $this->getEditForm($record->ID);
 		} else {
 			$this->response->addHeader('X-Status', _t('LeftAndMain.SAVEDUP'));
-
-			// Reload form, data and actions might have changed
-			$form = $this->getEditForm($record->ID);
 		}
-
-		return $form->forTemplate();
-	}
 
-
+		return $this->getResponseNegotiator()->respond($this->request);
+	}
 
 	/**
 	 * @uses LeftAndMainExtension->augmentNewSiteTreeItem()
@@ -742,9 +734,7 @@ public function revert($data, $form) {
 			)
 		);
 
-		$form = $this->getEditForm($record->ID);
+		return $this->getResponseNegotiator()->respond($this->request);
-
-		return $form->forTemplate();
 	}
 
 	/**
@@ -796,10 +786,7 @@ function unpublish($data, $form) {
 			sprintf(_t('CMSMain.REMOVEDPAGE',"Removed '%s' from the published site"),$record->Title)
 		);
 
-		// Reload form, data and actions might have changed
+		return $this->getResponseNegotiator()->respond($this->request);
-		$form = $this->getEditForm($record->ID);
-
-		return $form->forTemplate();
 	}
 
 	/**
@@ -948,10 +935,7 @@ function restore($data, $form) {
 			)
 		);
 
-		// Reload form, data and actions might have changed
+		return $this->getResponseNegotiator()->respond($this->request);
-		$form = $this->getEditForm($restoredPage->ID);
-
-		return $form->forTemplate();
 	}
 
 	function duplicate($request) {