mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
BUGFIX: put back into the SSNavigator the archived site link (#5251)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@101623 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
0449a6bc7d
commit
fb16cc63f6
@ -118,8 +118,16 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
||||
return true;
|
||||
}
|
||||
|
||||
function SwitchView() {
|
||||
if($page = $this->currentPage()) {
|
||||
/**
|
||||
* Overloads the LeftAndMain::ShowView. Allows to pass a page as a parameter, so we are able
|
||||
* to switch view also for archived versions.
|
||||
*/
|
||||
function SwitchView($page = null) {
|
||||
if(!$page) {
|
||||
$page = $this->currentPage();
|
||||
}
|
||||
|
||||
if($page) {
|
||||
$nav = SilverStripeNavigator::get_for_record($page);
|
||||
Requirements::customScript("window.name = windowName('cms');");
|
||||
return $nav['items'];
|
||||
@ -916,12 +924,14 @@ JS;
|
||||
if(Director::is_ajax()) {
|
||||
$result = $templateData->renderWith($this->class . '_right');
|
||||
$parts = split('</?form[^>]*>', $result);
|
||||
return $parts[sizeof($parts)-2];
|
||||
$content = $parts[sizeof($parts)-2];
|
||||
if($this->ShowSwitchView()) {
|
||||
$content .= '<div id="AjaxSwitchView">' . $this->SwitchView($record) . '</div>';
|
||||
}
|
||||
return $content;
|
||||
} else {
|
||||
return $templateData->renderWith('LeftAndMain');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user