tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Simplified ajax/non-ajax responses in CMS. Browsers handle 3xx Ajax responses transparently, so a CMS redirect (and some smartness in the JS state handling) is enough, no conditionals required.

Browse Source
This commit is contained in:
Ingo Schommer 2012-03-12 13:45:10 +01:00
parent a097266ded
commit 3248da02ce
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/AssetAdmin.php
View File

@ -407,9 +407,7 @@ JS
mkdir($record->FullPath); mkdir($record->FullPath);
chmod($record->FullPath, Filesystem::$file_create_mask); chmod($record->FullPath, Filesystem::$file_create_mask);
$link = Controller::join_links($this->Link('show'), $parentRecord->ID); return $this->redirect(Controller::join_links($this->Link('show'), $parentRecord->ID));
$this->getResponse()->addHeader('X-ControllerURL', $link);
return $this->redirect($link);
} }
/** /**

9
code/controllers/CMSPageAddController.php
View File

@ -126,14 +126,7 @@ class CMSPageAddController extends CMSPageEditController {
$editController = singleton('CMSPageEditController'); $editController = singleton('CMSPageEditController');
$editController->setCurrentPageID($record->ID); $editController->setCurrentPageID($record->ID);
$link = Controller::join_links(singleton('CMSPageEditController')->Link('show'), $record->ID); return $this->redirect(Controller::join_links(singleton('CMSPageEditController')->Link('show'), $record->ID));
$this->getResponse()->addHeader('X-ControllerURL', $link);
if(Director::is_ajax()) {
return $editController->renderWith(array_pop($editController->getTemplatesWithSuffix('_Content')));
} else {
return $this->redirect($link);
}
} }
} }