From 85a898e1d594a859a77c109e867c6de0c10f69c2 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 9 Apr 2012 23:55:23 +0200 Subject: [PATCH 1/2] MINOR Don't assume existence of cms/ folder in LeftAndMain->CMSVersion() (regression from earlier code) --- admin/code/LeftAndMain.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 20b652fa9..1a12da84c 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -1172,7 +1172,7 @@ class LeftAndMain extends Controller implements PermissionProvider { * @return string */ public function CMSVersion() { - if(file_exists(CMS_PATH . '/silverstripe_version')) { + if(defined('CMS_PATH') && file_exists(CMS_PATH . '/silverstripe_version')) { $sapphireVersion = file_get_contents(CMS_PATH . '/silverstripe_version'); } else { $sapphireVersion = file_get_contents(SAPPHIRE_PATH . '/silverstripe_version'); From 1742b4b7426375588b330693cf16314030bb8d29 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 10 Apr 2012 00:34:04 +0200 Subject: [PATCH 2/2] BUGFIX Fixed loading/saving regressions due to new PJAX logic introduced in e01b0aa3d03de2 --- admin/javascript/LeftAndMain.EditForm.js | 2 +- forms/gridfield/GridField.php | 2 +- forms/gridfield/GridFieldDetailForm.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/javascript/LeftAndMain.EditForm.js b/admin/javascript/LeftAndMain.EditForm.js index 4083f87ca..f21c28c68 100644 --- a/admin/javascript/LeftAndMain.EditForm.js +++ b/admin/javascript/LeftAndMain.EditForm.js @@ -142,7 +142,7 @@ * Suppress submission unless it is handled through ajaxSubmit(). */ onsubmit: function(e, button) { - this.parents('.cms-content').submitForm(this, button); + this.closest('.cms-content').submitForm(this, button); return false; }, diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php index ed342adf5..b4a4c4ad6 100755 --- a/forms/gridfield/GridField.php +++ b/forms/gridfield/GridField.php @@ -619,7 +619,7 @@ class GridField extends FormField { } } - switch($request->getHeader('X-Get-Fragment')) { + switch($request->getHeader('X-Pjax')) { case 'CurrentField': return $this->FieldHolder(); break; diff --git a/forms/gridfield/GridFieldDetailForm.php b/forms/gridfield/GridFieldDetailForm.php index 58bd39d5c..e7dc55fdc 100755 --- a/forms/gridfield/GridFieldDetailForm.php +++ b/forms/gridfield/GridFieldDetailForm.php @@ -311,7 +311,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler { $form->sessionMessage($message, 'good'); - return Controller::curr()->redirectBack(); + return Controller::curr()->redirect($this->Link()); } function doDelete($data, $form) {