From 2c1a4d5a8f7cb8a566c5193ef3c7916e128e083e Mon Sep 17 00:00:00 2001 From: hirenpatel Date: Tue, 29 Nov 2016 17:07:36 +0000 Subject: [PATCH 1/8] Testing version workaround --- composer.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4f171c4..a369308 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues" }, "require": { - "silverstripe/framework": "~3.1" + "silverstripe/framework": "4.0.0-alpha1 as 3.4.1" }, "extra": { "installer-name": "gridfieldextensions", @@ -33,5 +33,7 @@ }, "replace": { "ajshort/silverstripe-gridfieldextensions": "self.version" - } + }, + "prefer-stable": true, + "minimum-stability": "dev" } From 785651bf696cca5d7cda6a7f4101a463032d4990 Mon Sep 17 00:00:00 2001 From: hirenpatel Date: Tue, 29 Nov 2016 17:08:33 +0000 Subject: [PATCH 2/8] Testing version workaround - bumpity bump --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a369308..ab1b0fd 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "issues": "http://github.com/silverstripe-australia/silverstripe-gridfieldextensions/issues" }, "require": { - "silverstripe/framework": "4.0.0-alpha1 as 3.4.1" + "silverstripe/framework": "4.0.0-alpha3 as 3.4.1" }, "extra": { "installer-name": "gridfieldextensions", From 7a8d3c4daa63ec1224cfe6940fd43c241d3e981a Mon Sep 17 00:00:00 2001 From: hirenpatel Date: Tue, 29 Nov 2016 17:20:15 +0000 Subject: [PATCH 3/8] Fixed namespacing + added PSR-4 info --- code/GridFieldAddExistingSearchButton.php | 2 ++ code/GridFieldAddExistingSearchHandler.php | 2 ++ code/GridFieldAddNewInlineButton.php | 2 ++ code/GridFieldAddNewMultiClass.php | 2 ++ code/GridFieldAddNewMultiClassHandler.php | 2 ++ code/GridFieldEditableColumns.php | 2 ++ code/GridFieldExtensions.php | 2 ++ code/GridFieldExternalLink.php | 2 ++ code/GridFieldOrderableRows.php | 2 ++ code/GridFieldRequestHandler.php | 2 ++ code/GridFieldTitleHeader.php | 2 ++ composer.json | 5 ++++- 12 files changed, 26 insertions(+), 1 deletion(-) diff --git a/code/GridFieldAddExistingSearchButton.php b/code/GridFieldAddExistingSearchButton.php index d300d1c..c6a47c4 100755 --- a/code/GridFieldAddExistingSearchButton.php +++ b/code/GridFieldAddExistingSearchButton.php @@ -1,5 +1,7 @@ Date: Tue, 29 Nov 2016 17:30:01 +0000 Subject: [PATCH 4/8] Added ReflectionClass dependency --- code/GridFieldAddNewMultiClass.php | 1 + 1 file changed, 1 insertion(+) diff --git a/code/GridFieldAddNewMultiClass.php b/code/GridFieldAddNewMultiClass.php index c416b34..81bce5a 100755 --- a/code/GridFieldAddNewMultiClass.php +++ b/code/GridFieldAddNewMultiClass.php @@ -12,6 +12,7 @@ use SilverStripe\Forms\GridField\GridField; use SilverStripe\Forms\GridField\GridField_HTMLProvider; use SilverStripe\Forms\GridField\GridField_URLHandler; use SilverStripe\View\ArrayData; +use ReflectionClass; /** * A component which lets the user select from a list of classes to create a new record form. From 10cbe6959a0aeb8dfb9ca0db94af1fc7d27b25a8 Mon Sep 17 00:00:00 2001 From: hirenpatel Date: Tue, 29 Nov 2016 17:39:16 +0000 Subject: [PATCH 5/8] Template changes --- .../Forms/GridField}/GridFieldAddExistingSearchButton.ss | 0 .../Forms/GridField}/GridFieldAddExistingSearchHandler.ss | 0 .../Forms/GridField}/GridFieldAddNewInlineButton.ss | 0 .../Forms/GridField}/GridFieldAddNewInlineRow.ss | 0 .../Forms/GridField}/GridFieldAddNewMultiClass.ss | 0 .../{ => SilverStripe/Forms/GridField}/GridFieldExternalLink.ss | 0 .../Forms/GridField}/GridFieldOrderableRowsDragHandle.ss | 0 .../{ => SilverStripe/Forms/GridField}/GridFieldRequestHandler.ss | 0 .../{ => SilverStripe/Forms/GridField}/GridFieldTitleHeader.ss | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldAddExistingSearchButton.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldAddExistingSearchHandler.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldAddNewInlineButton.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldAddNewInlineRow.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldAddNewMultiClass.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldExternalLink.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldOrderableRowsDragHandle.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldRequestHandler.ss (100%) rename templates/{ => SilverStripe/Forms/GridField}/GridFieldTitleHeader.ss (100%) diff --git a/templates/GridFieldAddExistingSearchButton.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchButton.ss similarity index 100% rename from templates/GridFieldAddExistingSearchButton.ss rename to templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchButton.ss diff --git a/templates/GridFieldAddExistingSearchHandler.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchHandler.ss similarity index 100% rename from templates/GridFieldAddExistingSearchHandler.ss rename to templates/SilverStripe/Forms/GridField/GridFieldAddExistingSearchHandler.ss diff --git a/templates/GridFieldAddNewInlineButton.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineButton.ss similarity index 100% rename from templates/GridFieldAddNewInlineButton.ss rename to templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineButton.ss diff --git a/templates/GridFieldAddNewInlineRow.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineRow.ss similarity index 100% rename from templates/GridFieldAddNewInlineRow.ss rename to templates/SilverStripe/Forms/GridField/GridFieldAddNewInlineRow.ss diff --git a/templates/GridFieldAddNewMultiClass.ss b/templates/SilverStripe/Forms/GridField/GridFieldAddNewMultiClass.ss similarity index 100% rename from templates/GridFieldAddNewMultiClass.ss rename to templates/SilverStripe/Forms/GridField/GridFieldAddNewMultiClass.ss diff --git a/templates/GridFieldExternalLink.ss b/templates/SilverStripe/Forms/GridField/GridFieldExternalLink.ss similarity index 100% rename from templates/GridFieldExternalLink.ss rename to templates/SilverStripe/Forms/GridField/GridFieldExternalLink.ss diff --git a/templates/GridFieldOrderableRowsDragHandle.ss b/templates/SilverStripe/Forms/GridField/GridFieldOrderableRowsDragHandle.ss similarity index 100% rename from templates/GridFieldOrderableRowsDragHandle.ss rename to templates/SilverStripe/Forms/GridField/GridFieldOrderableRowsDragHandle.ss diff --git a/templates/GridFieldRequestHandler.ss b/templates/SilverStripe/Forms/GridField/GridFieldRequestHandler.ss similarity index 100% rename from templates/GridFieldRequestHandler.ss rename to templates/SilverStripe/Forms/GridField/GridFieldRequestHandler.ss diff --git a/templates/GridFieldTitleHeader.ss b/templates/SilverStripe/Forms/GridField/GridFieldTitleHeader.ss similarity index 100% rename from templates/GridFieldTitleHeader.ss rename to templates/SilverStripe/Forms/GridField/GridFieldTitleHeader.ss From 5c143dc57f56aecfde27416c9f97bf9169799b35 Mon Sep 17 00:00:00 2001 From: hirenpatel Date: Tue, 29 Nov 2016 21:30:30 +0000 Subject: [PATCH 6/8] Bug fixes --- code/GridFieldOrderableRows.php | 2 +- .../Forms/GridField => }/GridFieldOrderableRowsDragHandle.ss | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename templates/{SilverStripe/Forms/GridField => }/GridFieldOrderableRowsDragHandle.ss (100%) diff --git a/code/GridFieldOrderableRows.php b/code/GridFieldOrderableRows.php index a6002d2..79b7b5a 100755 --- a/code/GridFieldOrderableRows.php +++ b/code/GridFieldOrderableRows.php @@ -180,7 +180,7 @@ class GridFieldOrderableRows extends RequestHandler implements $classes = ClassInfo::dataClassesFor($list->dataClass()); foreach($classes as $class) { - if(singleton($class)->hasOwnTableDatabaseField($field)) { + if(singleton($class)->hasDataBaseField($field)) { return $class; } } diff --git a/templates/SilverStripe/Forms/GridField/GridFieldOrderableRowsDragHandle.ss b/templates/GridFieldOrderableRowsDragHandle.ss similarity index 100% rename from templates/SilverStripe/Forms/GridField/GridFieldOrderableRowsDragHandle.ss rename to templates/GridFieldOrderableRowsDragHandle.ss From d12448b523688f61a6cbac3de71ada7975ca93a3 Mon Sep 17 00:00:00 2001 From: hirenpatel Date: Wed, 30 Nov 2016 00:03:24 +0000 Subject: [PATCH 7/8] Updated SS_HTTPResponse_Exception -> HTTPResponse_Exception --- code/GridFieldAddNewMultiClass.php | 4 ++-- code/GridFieldEditableColumns.php | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/GridFieldAddNewMultiClass.php b/code/GridFieldAddNewMultiClass.php index 81bce5a..862eb8b 100755 --- a/code/GridFieldAddNewMultiClass.php +++ b/code/GridFieldAddNewMultiClass.php @@ -3,7 +3,7 @@ namespace SilverStripe\Forms\GridField; use SilverStripe\Control\Controller; -use SilverStripe\Control\SS_HTTPResponse_Exception; +use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Config; use SilverStripe\Core\Object; @@ -179,7 +179,7 @@ class GridFieldAddNewMultiClass implements GridField_HTMLProvider, GridField_URL } if(!$class || !array_key_exists($class, $classes)) { - throw new SS_HTTPResponse_Exception(400); + throw new HTTPResponse_Exception(400); } $handler = Object::create($this->itemRequestClass, diff --git a/code/GridFieldEditableColumns.php b/code/GridFieldEditableColumns.php index 6c2edaf..568417a 100644 --- a/code/GridFieldEditableColumns.php +++ b/code/GridFieldEditableColumns.php @@ -3,7 +3,7 @@ namespace SilverStripe\Forms\GridField; use SilverStripe\Control\Controller; -use SilverStripe\Control\SS_HTTPResponse_Exception; +use SilverStripe\Control\HTTPResponse_Exception; use SilverStripe\Core\Object; use SilverStripe\Forms\FieldList; use SilverStripe\Forms\Form; @@ -151,11 +151,11 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements $list = $grid->getList(); if(!ctype_digit($id)) { - throw new SS_HTTPResponse_Exception(null, 400); + throw new HTTPResponse_Exception(null, 400); } if(!$record = $list->byID($id)) { - throw new SS_HTTPResponse_Exception(null, 404); + throw new HTTPResponse_Exception(null, 404); } $form = $this->getForm($grid, $record); From a10b39a0f64032187eaa76b13a2168da62bd56de Mon Sep 17 00:00:00 2001 From: hirenpatel Date: Wed, 30 Nov 2016 01:08:50 +0000 Subject: [PATCH 8/8] Fix for namespaced classes --- code/GridFieldAddNewMultiClass.php | 2 +- javascript/GridFieldExtensions.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/GridFieldAddNewMultiClass.php b/code/GridFieldAddNewMultiClass.php index 862eb8b..637da1c 100755 --- a/code/GridFieldAddNewMultiClass.php +++ b/code/GridFieldAddNewMultiClass.php @@ -40,7 +40,7 @@ class GridFieldAddNewMultiClass implements GridField_HTMLProvider, GridField_URL /** * @var string */ - protected $itemRequestClass = 'GridFieldAddNewMultiClassHandler'; + protected $itemRequestClass = 'SilverStripe\\Forms\\GridField\\GridFieldAddNewMultiClassHandler'; /** * @param string $fragment the fragment to render the button in diff --git a/javascript/GridFieldExtensions.js b/javascript/GridFieldExtensions.js index 435cdb6..8987740 100644 --- a/javascript/GridFieldExtensions.js +++ b/javascript/GridFieldExtensions.js @@ -221,7 +221,7 @@ var cls = this.parents(".ss-gridfield-add-new-multi-class").find("select").val(); if(cls && cls.length) { - this.getGridField().showDetailView(link.replace("{class}", cls)); + this.getGridField().showDetailView(link.replace("{class}", encodeURI(cls))); } return false;