Skip to content
Snippets Groups Projects
Commit 98f79dff authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] All filters considered if none are selected in queue filter

parent 5bb0694f
No related branches found
No related tags found
1 merge request!3New version 4 1
......@@ -93,8 +93,8 @@ class MailRepository extends AbstractRepository {
}
$constraintsOr = [];
$search = '%' . $filters['filterSearch'] . '%';
if ($filters['filterFields'] && trim($filters['filterFields'] !== '')) {
$search = '%' . $filters['filterSearch'] . '%';
foreach ($filters['filterFields'] as $field) {
switch ($field) {
case BackendService::SENDER_FILTER_OPTION :
......@@ -123,8 +123,17 @@ class MailRepository extends AbstractRepository {
break;
}
}
$constraintsAnd[] = $query->logicalOr($constraintsOr);
} else { // if nothing selected, search in all fields
$constraintsOr[] = $query->like('from_address', $search);
$constraintsOr[] = $query->like('to_address', $search);
$constraintsOr[] = $query->like('mail_subject', $search);
$constraintsOr[] = $query->like('mail_body', $search);
$constraintsOr[] = $query->like('cc_addresses', $search);
$constraintsOr[] = $query->like('bcc_addresses', $search);
$constraintsOr[] = $query->like('from_name', $search);
$constraintsOr[] = $query->like('reply_to', $search);
}
$constraintsAnd[] = $query->logicalOr($constraintsOr);
$fromTime = strtotime($filters['filterFromDate']);
if ($fromTime) {
......
......@@ -70,8 +70,8 @@
<target>Bis:</target>
</trans-unit>
<trans-unit id="backend.filter.fields.description" approved="yes">
<source>Please select one or more fields you want to filter for:</source>
<target>Bitte wählen Sie ein oder mehrere Felder nach denen Sie filtern möchten:</target>
<source>Please select the fields you want to search (If none are selected all fields are considered) :</source>
<target>Bitte wählen welche Felder Sie durchsuchen möchten möchten (Sind keine ausgewählt, werden alle berücksichtigt):</target>
</trans-unit>
<trans-unit id="backend.filter.filter" approved="yes">
<source>Filter</source>
......
......@@ -55,7 +55,7 @@
<source>To:</source>
</trans-unit>
<trans-unit id="backend.filter.fields.description">
<source>Please select one or more fields you want to filter for:</source>
<source>Please select the fields you want to search (If none are selected all fields are considered) :</source>
</trans-unit>
<trans-unit id="backend.filter.filter">
<source>Filter</source>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment