Patch: Search by tickets that have all of chosen tags

xaviqv · xaviqv · commit d3dcfb71d366 · 2019-09-04T20:27:00.000+02:00
diff --git a/src/Controllers/TicketsController.php b/src/Controllers/TicketsController.php
@@ -118,9 +118,11 @@ public function data($ticketList = 'active')
 				}
 
 				if (isset($search_fields['tags'])){
-					$collection->whereHas('tags', function($query) use($search_fields){
-						$query->whereIn('id', $search_fields['tags']);
-					});
+					foreach ($search_fields['tags'] as $tag_id){
+						$collection->whereHas('tags', function($q1) use($tag_id){
+							$q1->where('id', $tag_id);
+						});
+					}
 				}
 
 				if (isset($search_fields['comments'])){

Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,11 @@ public function data($ticketList = 'active')`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`if (isset($search_fields['tags'])){`
`121`		`- $collection->whereHas('tags', function($query) use($search_fields){`
`122`		`- $query->whereIn('id', $search_fields['tags']);`
`123`		`- });`
	`121`	`+ foreach ($search_fields['tags'] as $tag_id){`
	`122`	`+ $collection->whereHas('tags', function($q1) use($tag_id){`
	`123`	`+ $q1->where('id', $tag_id);`
	`124`	`+ });`
	`125`	`+ }`
`124`	`126`	`}`
`125`	`127`
`126`	`128`	`if (isset($search_fields['comments'])){`