Merge pull request silverstripe#464 from mateusz/os7299

BUGFIX: add capability of redirecting form actions.
clarkepaul · May 18, 2012 · 3f932d6 · 3f932d6
2 parents 1e47b0f + 8b4b896
commit 3f932d6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php
@@ -106,7 +106,7 @@ class LeftAndMain extends Controller implements PermissionProvider {
 	);
 
 	/**
-	 * @var PJAXResponseNegotiator
+	 * @var PjaxResponseNegotiator
 	 */
 	protected $responseNegotiator;
 
@@ -416,12 +416,12 @@ public function show($request) {
 	/**
 	 * Caution: Volatile API.
 	 *  
-	 * @return PJAXResponseNegotiator
+	 * @return PjaxResponseNegotiator
 	 */
 	public function getResponseNegotiator() {
 		if(!$this->responseNegotiator) {
 			$controller = $this;
-			$this->responseNegotiator = new PJAXResponseNegotiator(array(
+			$this->responseNegotiator = new PjaxResponseNegotiator(array(
 				'CurrentForm' => function() use(&$controller) {
 					return $controller->getEditForm()->forTemplate();
 				},

diff --git a/admin/javascript/LeftAndMain.Content.js b/admin/javascript/LeftAndMain.Content.js
@@ -80,10 +80,18 @@
 				// as automatic browser ajax response redirects seem to discard the hash/fragment.
 				formData.push({name: 'BackURL', value:History.getPageUrl()});
 
+				// Some action buttons are redirecting to content areas as oposed to reloading the form.
+				// They will have pjax-content class on them.
+				var pjaxType = 'CurrentForm', pjaxSelector = '.cms-edit-form';
+				if ($(button).hasClass('pjax-content')) {
+					pjaxType = 'Content';
+					pjaxSelector = '.cms-content';
+				}
+
 				jQuery.ajax(jQuery.extend({
 					headers: {
-						"X-Pjax" : "CurrentForm",
+						"X-Pjax" : pjaxType,
-						'X-Pjax-Selector': '.cms-edit-form'
+						'X-Pjax-Selector': pjaxSelector
 					},
 					url: form.attr('action'), 
 					data: formData,

diff --git a/forms/gridfield/GridFieldDetailForm.php b/forms/gridfield/GridFieldDetailForm.php
@@ -291,8 +291,9 @@ function ItemEditForm() {
 		if($this->record->ID !== 0) {
 			$actions->push(FormAction::create('doSave', _t('GridFieldDetailForm.Save', 'Save'))
 				->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'));
+			// The delete action will redirect, hence pjax-content class.
 			$actions->push(FormAction::create('doDelete', _t('GridFieldDetailForm.Delete', 'Delete'))
-				->addExtraClass('ss-ui-action-destructive'));
+				->addExtraClass('ss-ui-action-destructive')->addExtraClass('pjax-content'));
 		}else{ // adding new record
 			//Change the Save label to 'Create'
 			$actions->push(FormAction::create('doSave', _t('GridFieldDetailForm.Create', 'Create'))