Merge pull request #4 from dnadesign/feature/silverstripe-4

Silverstripe 4 support
dnadesign · Sep 8, 2017 · e5330db · e5330db
2 parents 6417875 + ef38924
commit e5330db
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/_config.php b/_config.php
@@ -1 +1,6 @@
 <?php
+
+namespace DNA\AdvancedDropdowns;
+
+
+
diff --git a/code/AdvancedDropdownField.php b/code/AdvancedDropdownField.php
@@ -1,6 +1,16 @@
 <?php
 
-class AdvancedDropdownField extends DropDownField {
+namespace DNA\AdvancedDropdowns;
+
+
+use SilverStripe\Forms\DropdownField;
+use SilverStripe\View\ArrayData;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\Forms\FormField;
+
+
+
+class AdvancedDropdownField extends DropdownField {
 
 	protected $extraClasses = array('dropdown advanceddropdown');
 
@@ -15,7 +25,7 @@ public function Field($properties = array()) {
 			$empty = $this->getEmptyString();
 			$options[] = new ArrayData(array(
 				'Value' => '',
-				'Title' => $empty['Title'],
+				'Title' => $empty,
 				'Selected' => $selected,
 				'Disabled' => $disabled,
 				'Attributes' => $this->createOptionAttributes($empty)

diff --git a/code/AdvancedGroupedDropdownField.php b/code/AdvancedGroupedDropdownField.php
@@ -1,6 +1,15 @@
 <?php
 
-class AdvancedGroupedDropdownField extends GroupedDropDownField {
+namespace DNA\AdvancedDropdowns;
+
+use SilverStripe\Forms\FormField;
+use SilverStripe\Forms\GroupedDropdownField;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\View\ArrayData;
+
+
+
+class AdvancedGroupedDropdownField extends GroupedDropdownField {
 
 	public function Field($properties = array()) {
 		$options = '';

diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
 		}
 	],
 	"require": {
-		"silverstripe/framework": "~3.1"
+		"silverstripe/framework": "^4.0"
 	},
 	"extra": {
 		"installer-name": "advanceddropdowns"

diff --git a/templates/AdvancedDropdownField.ss → ...dvancedDropdowns/AdvancedDropdownField.ss b/templates/AdvancedDropdownField.ss → ...dvancedDropdowns/AdvancedDropdownField.ss