joomla/Component-Builder
39
25
Fork 11
Code Issues 78 Pull Requests Projects 4 Wiki Activity

Resolved gh-576 to allow empty filter options.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2020-07-26 18:21:08 +02:00
parent 6bb23fc6ee
commit 05da68f1ae
6 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
admin/helpers/compiler/e_Interpretation.php
View File

@ -3160,11 +3160,16 @@ class Interpretation extends Fields
. $ter['table_key'] . " " . $ter['operator']
. " (' . implode(',', \$array) . ')');";
$string .= PHP_EOL . $this->_t(2) . $tab . "}";
$string .= PHP_EOL . $this->_t(2) . $tab . "else";
$string .= PHP_EOL . $this->_t(2) . $tab . "{";
$string .= PHP_EOL . $this->_t(2) . $tab
. $this->_t(1) . "return false;";
$string .= PHP_EOL . $this->_t(2) . $tab . "}";
// check if empty is allowed
if (!isset($ter['empty']) || !$ter['empty'])
{
$string .= PHP_EOL . $this->_t(2) . $tab
. "else";
$string .= PHP_EOL . $this->_t(2) . $tab . "{";
$string .= PHP_EOL . $this->_t(2) . $tab
. $this->_t(1) . "return false;";
$string .= PHP_EOL . $this->_t(2) . $tab . "}";
}
}
else
{
@ -3193,11 +3198,16 @@ class Interpretation extends Fields
. $ter['table_key'] . " " . $ter['operator']
. " ' . \$checkValue);";
$string .= PHP_EOL . $this->_t(2) . $tab . "}";
$string .= PHP_EOL . $this->_t(2) . $tab . "else";
$string .= PHP_EOL . $this->_t(2) . $tab . "{";
$string .= PHP_EOL . $this->_t(2) . $tab
. $this->_t(1) . "return false;";
$string .= PHP_EOL . $this->_t(2) . $tab . "}";
// check if empty is allowed
if (!isset($ter['empty']) || !$ter['empty'])
{
$string .= PHP_EOL . $this->_t(2) . $tab
. "else";
$string .= PHP_EOL . $this->_t(2) . $tab . "{";
$string .= PHP_EOL . $this->_t(2) . $tab
. $this->_t(1) . "return false;";
$string .= PHP_EOL . $this->_t(2) . $tab . "}";
}
}
break;
case 9: