Merge pull request #40 from alex-dna/master

Fix missing use statement, missing owner and unknown method
dnadesign · Feb 25, 2021 · eac7ccc · eac7ccc
2 parents 8f13697 + 3739ca0
commit eac7ccc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/Extension/BaseElementExtension.php b/src/Extension/BaseElementExtension.php
@@ -2,17 +2,20 @@
 
 namespace DNADesign\ElementalVirtual\Extensions;
 
+use DNADesign\Elemental\Models\ElementalArea;
 use DNADesign\ElementalVirtual\Forms\ElementalGridFieldDeleteAction;
 use DNADesign\ElementalVirtual\Model\ElementVirtual;
-use SilverStripe\ORM\DataExtension;
 use SilverStripe\Forms\FieldList;
-use SilverStripe\Versioned\Versioned;
-use SilverStripe\Forms\LiteralField;
+use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
+use SilverStripe\Forms\GridField\GridFieldAddNewButton;
 use SilverStripe\Forms\GridField\GridFieldConfig_Base;
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
-use SilverStripe\Forms\GridField\GridFieldAddNewButton;
-use SilverStripe\Forms\GridField\GridFieldAddExistingAutocompleter;
 use SilverStripe\Forms\GridField\GridFieldDetailForm;
+use SilverStripe\Forms\LiteralField;
+use SilverStripe\ORM\ArrayList;
+use SilverStripe\ORM\DataExtension;
+use SilverStripe\ORM\FieldType\DBHTMLText;
+use SilverStripe\Versioned\Versioned;
 
 class BaseElementExtension extends DataExtension
 {
@@ -236,7 +239,7 @@ public function getUsage()
     {
         $usage = new ArrayList();
 
-        if ($page = $this->getPage()) {
+        if ($page = $this->owner->getPage()) {
             $usage->push($page);
             if ($this->virtualOwner) {
                 $page->setField('ElementType', 'Linked');
@@ -245,7 +248,7 @@ public function getUsage()
             }
         }
 
-        $linkedElements = ElementVirtual::get()->filter('LinkedElementID', $this->ID);
+        $linkedElements = ElementVirtual::get()->filter('LinkedElementID', $this->owner->ID);
 
         foreach ($linkedElements as $element) {
             $area = $element->Parent();

diff --git a/src/Forms/ElementalGridFieldAddExistingAutocompleter.php b/src/Forms/ElementalGridFieldAddExistingAutocompleter.php
@@ -40,15 +40,14 @@ class ElementalGridFieldAddExistingAutocompleter extends GridFieldAddExistingAut
      */
     public function getManipulatedData(GridField $gridField, SS_List $dataList)
     {
-
         if (!$gridField->State->GridFieldAddRelation) {
             return $dataList;
         }
 
         $objectID = Convert::raw2sql($gridField->State->GridFieldAddRelation);
 
         if ($objectID) {
-            $object = DataObject::get_by_id($dataList->dataclass(), $objectID);
+            $object = DataObject::get_by_id($gridField->getModelClass(), $objectID);
 
             if ($object) {
                 // if the object is currently not linked to either a page or another list then we want to link to