Add projects search

2 files changed, 10 insertions, 2 deletions

diff --git a/app/Controller/GroupListController.php b/app/Controller/GroupListController.php
index 9663638d..f56e63a4 100644
--- a/app/Controller/GroupListController.php
+++ b/app/Controller/GroupListController.php
@@ -24,7 +24,7 @@ class GroupListController extends BaseController
         $query = $this->groupModel->getQuery();
 
         if ($search !== '') {
-            $query->ilike('name', '%'.$search.'%');
+            $query->ilike('groups.name', '%'.$search.'%');
         }
 
         $paginator = $this->paginator
diff --git a/app/Controller/ProjectListController.php b/app/Controller/ProjectListController.php
index 95ff5d91..88dac4f8 100644
--- a/app/Controller/ProjectListController.php
+++ b/app/Controller/ProjectListController.php
@@ -23,16 +23,24 @@ class ProjectListController extends BaseController
             $projectIds = $this->projectPermissionModel->getProjectIds($this->userSession->getId());
         }
 
+        $query = $this->projectModel->getQueryByProjectIds($projectIds);
+        $search = $this->request->getStringParam('search');
+
+        if ($search !== '') {
+            $query->ilike('projects.name', '%' . $search . '%');
+        }
+
         $paginator = $this->paginator
             ->setUrl('ProjectListController', 'show')
             ->setMax(20)
             ->setOrder('name')
-            ->setQuery($this->projectModel->getQueryByProjectIds($projectIds))
+            ->setQuery($query)
             ->calculate();
 
         $this->response->html($this->helper->layout->app('project_list/listing', array(
             'paginator'   => $paginator,
             'title'       => t('Projects') . ' (' . $paginator->getTotal() . ')',
+            'values'      => array('search' => $search),
         )));
     }
 }