BUGFIX Corrected page history pane loading (fixes #7477)

chillu · chillu · commit c8052da5b83e · 2012-06-15T12:50:54.000+02:00
diff --git a/code/controllers/CMSPageHistoryController.php b/code/controllers/CMSPageHistoryController.php
@@ -20,20 +20,37 @@ class CMSPageHistoryController extends CMSMain {
 	public static $url_handlers = array(
 		'$Action/$ID/$VersionID/$OtherVersionID' => 'handleAction'
 	);
+
+	public function getResponseNegotiator() {
+		$negotiator = parent::getResponseNegotiator();
+		$controller = $this;
+		$negotiator->setCallback('CurrentForm', function() use(&$controller) {
+			$form = $controller->ShowVersionForm($controller->getRequest()->param('VersionID'));
+			if($form) return $form->forTemplate();
+			else return $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
+		});
+		$negotiator->setCallback('default', function() use(&$controller) {
+			return $controller->renderWith($controller->getViewer('show'));
+		});
+		return $negotiator;
+	}
 	
 	/**
 	 * @return array
 	 */
 	function show($request) {
 		$form = $this->ShowVersionForm($request->param('VersionID'));
 		
-		if($request->isAjax()) {
-			if($form) $content = $form->forTemplate();
-			else $content = $this->renderWith($this->getTemplatesWithSuffix('_Content'));
-		} else {
-			$content = $this->customise(array('EditForm' => $form))->renderWith($this->getViewer('show'));
-		}
-		return $content;
+		$negotiator = $this->getResponseNegotiator();
+		$controller = $this;
+		$negotiator->setCallback('CurrentForm', function() use(&$controller, &$form) {
+			return $form ? $form->forTemplate() : $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
+		});
+		$negotiator->setCallback('default', function() use(&$controller, &$form) {
+			return $controller->customise(array('EditForm' => $form))->renderWith($controller->getViewer('show'));
+		});
+
+		return $negotiator->respond($request);
 	}
 	
 	/**
@@ -44,12 +61,17 @@ function compare($request) {
 			$request->param('VersionID'), 
 			$request->param('OtherVersionID')
 		);
-		if($request->isAjax()) {
-			$content = $form->forTemplate();
-		} else {
-			$content = $this->customise(array('EditForm' => $form))->renderWith($this->getViewer('show'));
-		}
-		return $content;
+
+		$negotiator = $this->getResponseNegotiator();
+		$controller = $this;
+		$negotiator->setCallback('CurrentForm', function() use(&$controller, &$form) {
+			return $form ? $form->forTemplate() : $controller->renderWith($controller->getTemplatesWithSuffix('_Content'));
+		});
+		$negotiator->setCallback('default', function() use(&$controller, &$form) {
+			return $controller->customise(array('EditForm' => $form))->renderWith($controller->getViewer('show'));
+		});
+
+		return $negotiator->respond($request);
 	}
 	
 	/**
diff --git a/javascript/CMSPageHistoryController.js b/javascript/CMSPageHistoryController.js
@@ -79,7 +79,7 @@
 					url = ss.i18n.sprintf(this.data('linkTmplShow'), id,to);
 				}
 				
-				$('.cms-container').loadPanel(url, '', {selector: '.cms-edit-form'});
+				$('.cms-container').loadPanel(url, '', {pjax: 'CurrentForm'});
 			}
 		});
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@`
`79`	`79`	`url = ss.i18n.sprintf(this.data('linkTmplShow'), id,to);`
`80`	`80`	`}`
`81`	`81`
`82`		`- $('.cms-container').loadPanel(url, '', {selector: '.cms-edit-form'});`
	`82`	`+ $('.cms-container').loadPanel(url, '', {pjax: 'CurrentForm'});`
`83`	`83`	`}`
`84`	`84`	`});`
`85`	`85`