From 0d5551f927164b98c6204bf27c3a6df9a22a2672 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Tue, 22 Feb 2022 13:48:20 +0000
Subject: [PATCH] Fix the user-manage-organisations modal (column name &
 search)

---
 locale/en_US/messages.php                     |  2 ++
 src/Sprunje/OrganisationSprunje.php           | 27 +++++++++++++++++++
 .../user-manage-organisations.html.twig       |  1 +
 3 files changed, 30 insertions(+)

diff --git a/locale/en_US/messages.php b/locale/en_US/messages.php
index 4f2907e..6926470 100644
--- a/locale/en_US/messages.php
+++ b/locale/en_US/messages.php
@@ -143,4 +143,6 @@ return [
     'LEAVE'                              => 'Leave',
 
     'ACTION_CANNOT_UNDONE'               => 'This action cannot be undone!',
+
+    'IS_ADMINISTRATOR'                   => 'Administrator?',
 ];
diff --git a/src/Sprunje/OrganisationSprunje.php b/src/Sprunje/OrganisationSprunje.php
index a1fdd1c..e009c0c 100644
--- a/src/Sprunje/OrganisationSprunje.php
+++ b/src/Sprunje/OrganisationSprunje.php
@@ -41,6 +41,11 @@ class OrganisationSprunje extends Sprunje
         'member_count',
         'admin_count',
         'status',
+        'info',
+    ];
+
+    protected $excludeForAll = [
+        'info',
     ];
 
     /**
@@ -109,4 +114,26 @@ 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;
+    }
 }
diff --git a/templates/modals/user-manage-organisations.html.twig b/templates/modals/user-manage-organisations.html.twig
index 284e623..cf0d008 100644
--- a/templates/modals/user-manage-organisations.html.twig
+++ b/templates/modals/user-manage-organisations.html.twig
@@ -13,6 +13,7 @@
                 <tr>
                     <th>{{translate("NAME")}}</th>
                     <th>{{translate("DESCRIPTION")}}</th>
+                    <th>{{translate("IS_ADMINISTRATOR")}}</th>
                     <th>{{translate("REMOVE")}}</th>
                 </tr>
             </thead>