From f4f0ac096e82b6072c751f1bc234caa8df2b2d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thierry=20Fran=C3=A7ois?= Date: Sat, 6 Sep 2014 14:13:38 +0300 Subject: [PATCH] API bulk action names are case sensitive FIX #75 --- bulkManager/code/GridFieldBulkActionEditHandler.php | 6 +++--- .../code/GridFieldBulkActionUnlinkHandler.php | 8 ++++---- bulkManager/code/GridFieldBulkManager.php | 12 +++++------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/bulkManager/code/GridFieldBulkActionEditHandler.php b/bulkManager/code/GridFieldBulkActionEditHandler.php index 7ade675..4ff688a 100644 --- a/bulkManager/code/GridFieldBulkActionEditHandler.php +++ b/bulkManager/code/GridFieldBulkActionEditHandler.php @@ -20,8 +20,8 @@ class GridFieldBulkActionEditHandler extends GridFieldBulkActionHandler * @var array */ private static $url_handlers = array( - 'bulkedit/update' => 'update', - 'bulkedit' => 'edit' + 'bulkEdit/update' => 'update', + 'bulkEdit' => 'edit' ); @@ -46,7 +46,7 @@ class GridFieldBulkActionEditHandler extends GridFieldBulkActionHandler ->setAttribute('id', 'bulkEditingUpdateBtn') ->addExtraClass('ss-ui-action-constructive cms-panel-link') ->setAttribute('data-icon', 'accept') - ->setAttribute('data-url', $this->gridField->Link('bulkaction/bulkedit/update')) + ->setAttribute('data-url', $this->gridField->Link('bulkaction/bulkEdit/update')) ->setUseButtonTag(true) ->setAttribute('src', '')//changes type to image so isn't hooked by default actions handlers ); diff --git a/bulkManager/code/GridFieldBulkActionUnlinkHandler.php b/bulkManager/code/GridFieldBulkActionUnlinkHandler.php index 1293627..45cfd02 100644 --- a/bulkManager/code/GridFieldBulkActionUnlinkHandler.php +++ b/bulkManager/code/GridFieldBulkActionUnlinkHandler.php @@ -6,13 +6,13 @@ * @package GridFieldBulkEditingTools * @subpackage BulkManager */ -class GridFieldBulkActionUnlinkHandler extends GridFieldBulkActionHandler +class GridFieldBulkActionUnLinkHandler extends GridFieldBulkActionHandler { /** * RequestHandler allowed actions * @var array */ - private static $allowed_actions = array('unlink'); + private static $allowed_actions = array('unLink'); /** @@ -20,7 +20,7 @@ class GridFieldBulkActionUnlinkHandler extends GridFieldBulkActionHandler * @var array */ private static $url_handlers = array( - 'unlink' => 'unlink' + 'unLink' => 'unLink' ); @@ -30,7 +30,7 @@ class GridFieldBulkActionUnlinkHandler extends GridFieldBulkActionHandler * @param SS_HTTPRequest $request * @return SS_HTTPResponse List of affected records ID */ - public function unlink(SS_HTTPRequest $request) + public function unLink(SS_HTTPRequest $request) { $ids = $this->getRecordIDList(); $this->gridField->list->removeMany($ids); diff --git a/bulkManager/code/GridFieldBulkManager.php b/bulkManager/code/GridFieldBulkManager.php index 3f47007..a41d2ed 100644 --- a/bulkManager/code/GridFieldBulkManager.php +++ b/bulkManager/code/GridFieldBulkManager.php @@ -47,7 +47,7 @@ class GridFieldBulkManager implements GridField_HTMLProvider, GridField_ColumnPr if ( $defaultActions ) { $this->config['actions'] = array( - 'bulkedit' => array( + 'bulkEdit' => array( 'label' => _t('GRIDFIELD_BULK_MANAGER.EDIT_SELECT_LABEL', 'Edit'), 'handler' => 'GridFieldBulkActionEditHandler', 'config' => array( @@ -56,9 +56,9 @@ class GridFieldBulkManager implements GridField_HTMLProvider, GridField_ColumnPr 'isDestructive' => false ) ), - 'unlink' => array( + 'unLink' => array( 'label' => _t('GRIDFIELD_BULK_MANAGER.UNLINK_SELECT_LABEL', 'UnLink'), - 'handler' => 'GridFieldBulkActionUnlinkHandler', + 'handler' => 'GridFieldBulkActionUnLinkHandler', 'config' => array( 'isAjax' => true, 'icon' => 'chain--minus', @@ -203,11 +203,9 @@ class GridFieldBulkManager implements GridField_HTMLProvider, GridField_ColumnPr { if ( array_key_exists($name, $this->config['actions']) ) { - user_error("Bulk action $name already exists.", E_USER_ERROR); + user_error("Bulk action '$name' already exists.", E_USER_ERROR); } - $name = strtolower($name); - if ( !$label ) { $label = ucfirst($name); @@ -255,7 +253,7 @@ class GridFieldBulkManager implements GridField_HTMLProvider, GridField_ColumnPr { if ( !array_key_exists($name, $this->config['actions']) ) { - user_error("Bulk action $name doesn't exists.", E_USER_ERROR); + user_error("Bulk action '$name' doesn't exists.", E_USER_ERROR); } unset( $this->config['actions'][$name] );