jqh 4 år sedan
förälder
incheckning
373f7126aa
3 ändrade filer med 19 tillägg och 1 borttagningar
  1. 1 1
      src/Grid/Filter.php
  2. 8 0
      src/Grid/Filter/AbstractFilter.php
  3. 10 0
      tests/Models/User.php

+ 1 - 1
src/Grid/Filter.php

@@ -730,7 +730,7 @@ class Filter implements Renderable
         $filters = collect($this->filters);
 
         /** @var Collection $columns */
-        $columns = $filters->map->column()->flatten();
+        $columns = $filters->map->getElementName()->flatten();
 
         $columns->push(
             $this->grid()->model()->getPageName()

+ 8 - 0
src/Grid/Filter/AbstractFilter.php

@@ -169,6 +169,14 @@ abstract class AbstractFilter
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getElementName()
+    {
+        return $this->parent->grid()->makeName($this->originalColumn());
+    }
+
     /**
      * Format name.
      *

+ 10 - 0
tests/Models/User.php

@@ -15,6 +15,16 @@ class User extends Model
         return $this->hasOne(Profile::class, 'user_id');
     }
 
+    public function user_profile()
+    {
+        return $this->hasOne(Profile::class, 'user_id');
+    }
+
+    public function userProfile()
+    {
+        return $this->hasOne(Profile::class, 'user_id');
+    }
+
     public function getFullNameAttribute()
     {
         if (! $this->profile) {