Laravel-Backpack / CRUD

src/PanelTraits/Filters.php

Doc Comments +1 added lines, -2 removed lines

@@ -39,7 +39,6 @@ 
      * @param array         $options        Name, type, label, etc.
      * @param array/closure $values         The HTML for the filter.
      * @param closure       $filter_logic   Query modification (filtering) logic.
-     * @param closure       $default_logic  Query modification (filtering) logic when filter is not active.
      */
     public function addFilter($options, $values = false, $filter_logic = false, $fallback_logic = false)
     {
@@ -150,7 +149,7 @@ 
 
     /**
      * Determine if the current CRUD action is a list operation (using standard or ajax DataTables).
-     * @return bool
+     * @return boolean|null
      */
     public function doingListOperation()
     {

Indentation +14 added lines, -14 removed lines

@@ -66,20 +66,20 @@
 
         // if a closure was passed as "filter_logic"
         if ($this->doingListOperation()) {
-	        if ( $this->request->has( $options['name'] ) ) {
-		        if ( is_callable( $filter_logic ) ) {
-			        // apply it
-			        $filter_logic( $this->request->input( $options['name'] ) );
-		        } else {
-			        $this->addDefaultFilterLogic( $filter->name, $filter_logic );
-		        }
-	        } else {
-		        //if the filter is not active, but fallback logic was supplied
-		        if ( is_callable( $fallback_logic ) ) {
-			        // apply the default logic
-			        $fallback_logic();
-		        }
-	        }
+            if ( $this->request->has( $options['name'] ) ) {
+                if ( is_callable( $filter_logic ) ) {
+                    // apply it
+                    $filter_logic( $this->request->input( $options['name'] ) );
+                } else {
+                    $this->addDefaultFilterLogic( $filter->name, $filter_logic );
+                }
+            } else {
+                //if the filter is not active, but fallback logic was supplied
+                if ( is_callable( $fallback_logic ) ) {
+                    // apply the default logic
+                    $fallback_logic();
+                }
+            }
         }
     }