Merge pull request #5971 from JediKev/search/child-thread-relation

Reviewed-By: Peter Rotich <peter@osticket.com>
osTicket · Oct 7, 2021 · e90d3be · e90d3be
2 parents f0a58ed + 08785f9
commit e90d3be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/include/class.queue.php b/include/class.queue.php
@@ -381,7 +381,8 @@ static function getSearchableFields($base, $recurse=2,
             $exclude[$base] = 1;
             foreach ($base::getMeta('joins') as $path=>$j) {
                 $fc = $j['fkey'][0];
-                if (isset($exclude[$fc]) || $j['list'])
+                if (isset($exclude[$fc]) || $j['list']
+                        || (isset($j['searchable']) && !$j['searchable']))
                     continue;
                 foreach (static::getSearchableFields($fc, $recurse-1,
                     true, $exclude)

diff --git a/include/class.ticket.php b/include/class.ticket.php
@@ -88,6 +88,7 @@ class Ticket extends VerySimpleModel
                     'ticket_id'  => 'TicketThread.object_id',
                     "'C'" => 'TicketThread.object_type',
                 ),
+                'searchable' => false,
                 'null' => true,
             ),
             'cdata' => array(