From 1b5e83b7f6cadc7baa5b1e47f79726a4aca8f594 Mon Sep 17 00:00:00 2001 From: Lee Bradley Date: Tue, 14 Feb 2017 17:07:29 +0000 Subject: [PATCH 1/2] Fix for Exception namespace & CSS image move Missing '\\' before Exception Icon has moved in Framework --- css/GridFieldExtensions.css | 2 +- src/GridFieldOrderableRows.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/css/GridFieldExtensions.css b/css/GridFieldExtensions.css index d2a3038..9d43e84 100644 --- a/css/GridFieldExtensions.css +++ b/css/GridFieldExtensions.css @@ -154,7 +154,7 @@ width: 5px; height: 11px; margin: -5px 0 0 -2px; - background-image: url('../../framework/thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png'); + background-image: url('../../framework/admin/thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png'); background-position: -5px -227px; } diff --git a/src/GridFieldOrderableRows.php b/src/GridFieldOrderableRows.php index 949ee68..0ab98e3 100755 --- a/src/GridFieldOrderableRows.php +++ b/src/GridFieldOrderableRows.php @@ -196,7 +196,7 @@ class GridFieldOrderableRows extends RequestHandler implements } } - throw new Exception("Couldn't find the sort field '$field'"); + throw new \Exception("Couldn't find the sort field '$field'"); } public function getURLHandlers($grid) From cbcb6e57e0862e26e4562a34c3c4bf514ce6a9ec Mon Sep 17 00:00:00 2001 From: Lee Bradley Date: Tue, 14 Feb 2017 17:21:29 +0000 Subject: [PATCH 2/2] Applies changes from silverstripe-australia/silverstripe-gridfieldextensions#177 JS fix for "Initialising button before attempting to enable or disable it" Thanks @JackOconnor21 --- javascript/GridFieldExtensions.js | 4 ++-- src/GridFieldAddNewMultiClass.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/javascript/GridFieldExtensions.js b/javascript/GridFieldExtensions.js index 8987740..3498c49 100644 --- a/javascript/GridFieldExtensions.js +++ b/javascript/GridFieldExtensions.js @@ -239,9 +239,9 @@ var btn = this.parents(".ss-gridfield-add-new-multi-class").find(".ss-ui-button"); if(this.val() && this.val().length) { - btn.button("enable"); + btn.button().button("enable"); } else { - btn.button("disable"); + btn.button().button("disable"); } } }); diff --git a/src/GridFieldAddNewMultiClass.php b/src/GridFieldAddNewMultiClass.php index 506faf2..2f40a4c 100755 --- a/src/GridFieldAddNewMultiClass.php +++ b/src/GridFieldAddNewMultiClass.php @@ -41,7 +41,7 @@ class GridFieldAddNewMultiClass implements GridField_HTMLProvider, GridField_URL /** * @var string */ - protected $itemRequestClass = 'SilverStripe\\Forms\\GridField\\GridFieldAddNewMultiClassHandler'; + protected $itemRequestClass = 'SilverStripe\\GridFieldExtensions\\GridFieldAddNewMultiClassHandler'; /** * @param string $fragment the fragment to render the button in