Merge pull request #23 from sunnysideup/patch-1

API: allow Silverstripe 5.0
nathancox · Apr 17, 2024 · 9375920 · 9375920
2 parents 4fce857 + 6553e51
commit 9375920
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -32,6 +32,6 @@
         }
     },
 	"require": {
-		"silverstripe/framework": "~4.0"
+		"silverstripe/framework": "^4.0 || ^5.0"
 	}
 }
diff --git a/src/forms/HasOneAutocompleteField.php b/src/forms/HasOneAutocompleteField.php
@@ -64,6 +64,8 @@ class HasOneAutocompleteField extends FormField
 
     protected $clearButtonEnabled = false;
 
+    protected $sourceObject;
+
     /**
      * Variable that sets the autocomplete delay
      *
@@ -118,7 +120,7 @@ public function search(HTTPRequest $request)
             $json = $this->processResults($results);
         }
 
-        return Convert::array2json($json);
+        return json_encode($json);
     }
 
     /**
@@ -128,7 +130,7 @@ public function search(HTTPRequest $request)
      */
     protected function getResults($query)
     {
-         $searchFields = ($this->getSearchFields() ?: singleton($this->sourceObject)->stat('searchable_fields'));
+         $searchFields = ($this->getSearchFields() ?: singleton($this->sourceObject)->config()->get('searchable_fields'));
 
         if(!$searchFields) {
             throw new Exception(