Merge pull request silverstripe#59 from daniquilez/master

improvement on addBulkAction function.
daniquilez · May 9, 2014 · f259a4a · f259a4a
2 parents 43c8b0e + 4f4d187
commit f259a4a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/code/GridFieldBulkManager.php b/code/GridFieldBulkManager.php
@@ -211,9 +211,9 @@ function addBulkAction($name, $label = null, $handler = null, $config = null)
 		}
 		else{
 			$config = array(
-        'isAjax'        => true,
-        'icon'          => 'accept',
-        'isDestructive' => false
+				'isAjax'        => isset($config['isAjax']) ? $config['isAjax'] : true,
+				'icon'          => isset($config['icon']) ? $config['icon'] : 'accept',
+				'isDestructive' => isset($config['isDestructive']) ? $config['isDestructive'] : false
 			);
 		}
 
@@ -379,4 +379,4 @@ public function handlebulkaction($gridField, $request)
 
 		user_error("Unable to find matching bulk action handler for ".$request->remaining().'.', E_USER_ERROR);
 	}
-}
+}