From 90cc65ae5ebcc8a51b0d84743dcbd077d152aa32 Mon Sep 17 00:00:00 2001
From: JediKev <kevin@enhancesoft.com>
Date: Thu, 16 Aug 2018 10:59:06 -0500
Subject: [PATCH] issue: Task Term Search
This addresses an issue where searching for a Task by title returns all
Tasks in the search. This is due to the visibility filtering methods used to
filter tickets by staff's visibility.
---
include/staff/tasks.inc.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/include/staff/tasks.inc.php b/include/staff/tasks.inc.php
index 6d52d61fa..712a795af 100644
--- a/include/staff/tasks.inc.php
+++ b/include/staff/tasks.inc.php
@@ -127,19 +127,19 @@ if ($filters)
// Impose visibility constraints
// ------------------------------------------------------------
// -- Open and assigned to me
-$visibility = array(
+$visibility = Q::any(
new Q(array('flags__hasbit' => TaskModel::ISOPEN, 'staff_id' => $thisstaff->getId()))
);
// -- Routed to a department of mine
if (!$thisstaff->showAssignedOnly() && ($depts=$thisstaff->getDepts()))
- $visibility[] = new Q(array('dept_id__in' => $depts));
+ $visibility->add(new Q(array('dept_id__in' => $depts)));
// -- Open and assigned to a team of mine
if (($teams = $thisstaff->getTeams()) && count(array_filter($teams)))
- $visibility[] = new Q(array(
+ $visibility->add(new Q(array(
'team_id__in' => array_filter($teams),
'flags__hasbit' => TaskModel::ISOPEN
- ));
-$tasks->filter(Q::any($visibility));
+ )));
+$tasks->filter(new Q($visibility));
// Add in annotations
$tasks->annotate(array(
--
GitLab