From 3248da02ce66f2caeebd1509cb18698bec57966c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Mar 2012 13:45:10 +0100 Subject: [PATCH] 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. --- code/controllers/AssetAdmin.php | 4 +--- code/controllers/CMSPageAddController.php | 9 +-------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/code/controllers/AssetAdmin.php b/code/controllers/AssetAdmin.php index 1d8aaf98..21ebc9bc 100644 --- a/code/controllers/AssetAdmin.php +++ b/code/controllers/AssetAdmin.php @@ -407,9 +407,7 @@ JS mkdir($record->FullPath); chmod($record->FullPath, Filesystem::$file_create_mask); - $link = Controller::join_links($this->Link('show'), $parentRecord->ID); - $this->getResponse()->addHeader('X-ControllerURL', $link); - return $this->redirect($link); + return $this->redirect(Controller::join_links($this->Link('show'), $parentRecord->ID)); } /** diff --git a/code/controllers/CMSPageAddController.php b/code/controllers/CMSPageAddController.php index 2403dcbf..95cdbb03 100644 --- a/code/controllers/CMSPageAddController.php +++ b/code/controllers/CMSPageAddController.php @@ -126,14 +126,7 @@ class CMSPageAddController extends CMSPageEditController { $editController = singleton('CMSPageEditController'); $editController->setCurrentPageID($record->ID); - $link = 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); - } + return $this->redirect(Controller::join_links(singleton('CMSPageEditController')->Link('show'), $record->ID)); } } \ No newline at end of file