From 05da68f1ae65a6676fe74415d36a5fbaafc2d47a Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sun, 26 Jul 2020 18:21:08 +0200
Subject: [PATCH] Resolved gh-576 to allow empty filter options.

---
 README.md                                     |  6 ++--
 admin/README.txt                              |  6 ++--
 admin/helpers/compiler/e_Interpretation.php   | 30 ++++++++++++-------
 .../en-GB/en-GB.com_componentbuilder.ini      |  2 ++
 admin/models/forms/dynamic_get.xml            | 10 +++++++
 componentbuilder.xml                          |  2 +-
 6 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 40c043732..9c93b6ec4 100644
--- a/README.md
+++ b/README.md
@@ -144,12 +144,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 24th July, 2020
++ *Last Build*: 26th July, 2020
 + *Version*: 2.11.2
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **283043**
-+ *Field count*: **1525**
++ *Line count*: **283055**
++ *Field count*: **1526**
 + *File count*: **1785**
 + *Folder count*: **295**
 
diff --git a/admin/README.txt b/admin/README.txt
index 40c043732..9c93b6ec4 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -144,12 +144,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 24th July, 2020
++ *Last Build*: 26th July, 2020
 + *Version*: 2.11.2
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **283043**
-+ *Field count*: **1525**
++ *Line count*: **283055**
++ *Field count*: **1526**
 + *File count*: **1785**
 + *Folder count*: **295**
 
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 4b10da9a8..f6f8ef717 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -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:
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 47c181c89..b617492e3 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -4512,6 +4512,8 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_DIRECTION_LABEL="Ordering Direction"
 COM_COMPONENTBUILDER_DYNAMIC_GET_E="e"
 COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT="Editing the Dynamic Get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_EE="ee"
+COM_COMPONENTBUILDER_DYNAMIC_GET_EMPTY_DESCRIPTION="Empty"
+COM_COMPONENTBUILDER_DYNAMIC_GET_EMPTY_LABEL="Allow"
 COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL="equal"
 COM_COMPONENTBUILDER_DYNAMIC_GET_EQUAL_OR_NOT="equal or not"
 COM_COMPONENTBUILDER_DYNAMIC_GET_ERROR_UNIQUE_ALIAS="Another Dynamic Get has the same alias."
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml
index 21d67915f..bb3090580 100644
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@@ -810,6 +810,16 @@
 					message="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_MESSAGE"
 					hint="COM_COMPONENTBUILDER_DYNAMIC_GET_TABLE_KEY_HINT"
 				/>
+				<!-- Empty Field. Type: Checkbox. (joomla) -->
+				<field
+					type="checkbox"
+					name="empty"
+					label="COM_COMPONENTBUILDER_DYNAMIC_GET_EMPTY_LABEL"
+					value="1"
+					default="0"
+					description="COM_COMPONENTBUILDER_DYNAMIC_GET_EMPTY_DESCRIPTION"
+					class="inputbox"
+				/>
 			</form>
 		</field>
 		<!-- Add_php_after_getitems Field. Type: Radio. (joomla) -->
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 858737d50..edf385b64 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>24th July, 2020</creationDate>
+	<creationDate>26th July, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>