Adapt filters with empty and null values in alphanumeric custom fields

civicrm · Dec 1, 2020 · cdc6731 · cdc6731
1 parent 2e68206
commit cdc6731
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
@@ -2103,9 +2103,25 @@ public function whereClause(&$field, $op, $value, $min, $max) {
         break;
 
       case 'nll':
+        if ($type == 'String') {
+          $sqlOP = $this->getSQLOperator($op);
+          $clause = "( {$field['dbAlias']} $sqlOP OR {$field['dbAlias']} = '' )";
+        }
+        else {
+          $sqlOP = $this->getSQLOperator($op);
+          $clause = "( {$field['dbAlias']} $sqlOP )";
+        }
+        break;
+
       case 'nnll':
-        $sqlOP = $this->getSQLOperator($op);
-        $clause = "( {$field['dbAlias']} $sqlOP )";
+        if ($type == 'String') {
+          $sqlOP = $this->getSQLOperator($op);
+          $clause = "( {$field['dbAlias']} $sqlOP AND {$field['dbAlias']} <> '' )";
+        }
+        else {
+          $sqlOP = $this->getSQLOperator($op);
+          $clause = "( {$field['dbAlias']} $sqlOP )";
+        }
         break;
 
       case 'eq':