Fix filtering of name/description (case in-sensitive)

src/Controller/OrganisationController.php

@@ -645,8 +645,9 @@ class OrganisationController extends SimpleController
             });
         if (!$currentUser->isMaster() && $currentUser->roles()->where('slug', 'organisations-admin')->count() == 0) {
             $sprunje->extendQuery(function ($query) {
-                return $query->where('flag_approved', true)
-                    ->orWhereNotNull('is_member');
+                return $query->where(function($query) {
+                    $query->where('flag_approved', true)->orWhereNotNull('is_member');
+                });
             });
         }
 

src/Sprunje/OrganisationSprunje.php

@@ -83,6 +83,48 @@ class OrganisationSprunje extends Sprunje
         return $this;
     }
 
+    /**
+     * Filter by name (case insensitive).
+     *
+     * @param Builder $query
+     * @param mixed   $value
+     *
+     * @return self
+     */
+    protected function filterName($query, $value)
+    {
+        // Split value on separator for OR queries
+        $values = explode($this->orSeparator, $value);
+        $query->where(function ($query) use ($values) {
+            foreach ($values as $value) {
+                $query->orWhereRaw('LOWER(name) LIKE ?', [ '%' . strtolower($value) . '%' ]);
+            }
+        });
+
+        return $this;
+    }
+
+    /**
+     * Filter by description (case insensitive).
+     *
+     * @param Builder $query
+     * @param mixed   $value
+     *
+     * @return self
+     */
+    protected function filterDescription($query, $value)
+    {
+        // Split value on separator for OR queries
+        $values = explode($this->orSeparator, $value);
+        $query->where(function ($query) use ($values) {
+            foreach ($values as $value) {
+                $query->orWhereRaw('LOWER(description) LIKE ?', [ '%' . strtolower($value) . '%' ]);
+            }
+        });
+
+        return $this;
+    }
+
     /**
      * Return a list of possible user statuses.
      *
@@ -117,28 +159,6 @@ class OrganisationSprunje extends Sprunje
         return $this;
     }
 
-    /**
-     * Filter LIKE name OR description. (for user organisations modal)
-     *
-     * @param Builder $query
-     * @param mixed   $value
-     *
-     * @return self
-     */
-    protected function filterInfo($query, $value)
-    {
-        // Split value on separator for OR queries
-        $values = explode($this->orSeparator, $value);
-        $query->where(function ($query) use ($values) {
-            foreach ($values as $value) {
-                $query->orLike('name', $value)
-                    ->orLike('description', $value);
-            }
-        });
-
-        return $this;
-    }
-
     /**
      * Sort based on created date.
      *

templates/tables/organisations.html.twig

@@ -19,9 +19,9 @@
     <table id="{{table.id}}" class="tablesorter table table-bordered table-hover table-striped" data-sortlist="{{table.sortlist}}">
         <thead>
             <tr>
-                <th class="sorter-metatext" data-column-name="name" data-column-template="#{{table.id}}-column-info" data-priority="1">{{translate('ORGANISATION')}} <i class="fas fa-sort"></i></th>
+                <th class="sorter-metatext filter-metatext" data-column-name="name" data-column-template="#{{table.id}}-column-info" data-priority="1">{{translate('ORGANISATION')}} <i class="fas fa-sort"></i></th>
                 {% if 'description' not in table.hidden_columns %}
-                <th class="sorter-metatext" data-column-name="description" data-column-template="#{{table.id}}-column-description" data-priority="2">{{translate("DESCRIPTION")}} <i class="fas fa-sort"></i></th>
+                <th class="sorter-metatext filter-metatext" data-column-name="description" data-column-template="#{{table.id}}-column-description" data-priority="2">{{translate("DESCRIPTION")}} <i class="fas fa-sort"></i></th>
                 {% endif %}
                 {% if hasRole('site-admin') or hasRole('organisations-admin') or (current_user.adminForOrganisations.count > 0) -%}
                 <th class="filter-select filter-metatext" data-column-name="status" data-column-template="#{{table.id}}-column-status" data-priority="2">{{translate("STATUS")}} <i class="fas fa-sort"></i></th>