Merge pull request #2751 from feistiny/shift_ID_filter

[fix]#2737 Shift the default ID filter,exclude the ID filter later added.
z-song · Dec 13, 2018 · 4cd4e4a · 4cd4e4a
2 parents 777a368 + 009df7e
commit 4cd4e4a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/src/Grid/Filter.php b/src/Grid/Filter.php
@@ -222,16 +222,22 @@ public function disableIdFilter()
     public function removeIDFilterIfNeeded()
     {
         if (!$this->useIdFilter && !$this->idFilterRemoved) {
-            $this->removeFilterByID($this->primaryKey);
+            $this->removeDefaultIDFilter();
 
-            foreach ($this->layout->columns() as $column) {
-                $column->removeFilterByID($this->primaryKey);
-            }
+            $this->layout->removeDefaultIDFilter();
 
             $this->idFilterRemoved = true;
         }
     }
 
+    /**
+     * Remove the default ID filter.
+     */
+    protected function removeDefaultIDFilter()
+    {
+        array_shift($this->filters);
+    }
+
     /**
      * Remove filter by filter id.
      *
@@ -469,10 +475,10 @@ public function render()
         }
 
         return view($this->view)->with([
-            'action'    => $this->action ?: $this->urlWithoutFilters(),
-            'layout'    => $this->layout,
-            'filterID'  => $this->filterID,
-            'expand'    => $this->expand,
+            'action'   => $this->action ?: $this->urlWithoutFilters(),
+            'layout'   => $this->layout,
+            'filterID' => $this->filterID,
+            'expand'   => $this->expand,
         ])->render();
     }
 

diff --git a/src/Grid/Filter/Layout/Layout.php b/src/Grid/Filter/Layout/Layout.php
@@ -82,4 +82,16 @@ public function columns()
 
         return $this->columns;
     }
+
+    /**
+     * Remove the default ID filter of the default(first) column.
+     */
+    public function removeDefaultIDFilter()
+    {
+        $this->columns()
+            ->first()
+            ->filters()
+            ->shift()
+        ;
+    }
 }