tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR Fixed history panel non-ajax loading and version links in "comparing X and Y" titles

This commit is contained in:
Ingo Schommer 2011-09-19 21:06:39 +02:00
parent 872239830c
commit 10e76830c4
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
code/controllers/CMSPageHistoryController.php
View File

@ -23,24 +23,32 @@ class CMSPageHistoryController extends CMSMain {
/**
* @return array
*/
function show() {
return array(
'EditForm' => $this->ShowVersionForm(
$this->request->param('VersionID')
)
function show($request) {
$form = $this->ShowVersionForm(
$request->param('VersionID')
);
if($this->isAjax()) {
$content = $form->forTemplate();
} else {
$content = $this->customise(array('EditForm' => $form))->renderWith($this->getViewer('show'));
}
return $content;
}
/**
* @return array
*/
function compare() {
return array(
'EditForm' => $this->CompareVersionsForm(
$this->request->param('VersionID'),
$this->request->param('OtherVersionID')
)
function compare($request) {
$form = $this->CompareVersionsForm(
$request->param('VersionID'),
$request->param('OtherVersionID')
);
if($this->isAjax()) {
$content = $form->forTemplate();
} else {
$content = $this->customise(array('EditForm' => $form))->renderWith($this->getViewer('show'));
}
return $content;
}
/**
@ -92,7 +100,7 @@ class CMSPageHistoryController extends CMSMain {
if($compareID) {
$link = Controller::join_links(
$this->Link('version'),
$this->Link('show'),
$id
);