From e8a37ff0afb1eea2efe3c2698ad9517ec79e35b5 Mon Sep 17 00:00:00 2001
From: Bruno Da Silva <bruno.dasilva@combodo.com>
Date: Mon, 26 Mar 2018 11:55:10 +0000
Subject: [PATCH] search widget : widget numeric bugfix for between

SVN:b1162[5528]
---
 js/search/search_form_criteria_numeric.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/js/search/search_form_criteria_numeric.js b/js/search/search_form_criteria_numeric.js
index 8015e90e3..a85520ccb 100644
--- a/js/search/search_form_criteria_numeric.js
+++ b/js/search/search_form_criteria_numeric.js
@@ -193,17 +193,29 @@ $(function()
 				switch (true)
 				{
 					case (typeof aValues[0] == 'undefined' && typeof aValues[1] == 'undefined'):
-					case (typeof aValues[0].label == 'undefined' && typeof aValues[1].label == 'undefined'):
-					case (aValues[0].label.trim() == '' && aValues[1].label.trim() == ''):
 						var sDictEntrySuffix = ':All';
 						break;
 					case (typeof aValues[0] == 'undefined' ):
-					case (typeof aValues[0].label == 'undefined' ):
-					case (aValues[0].label.trim() == '' ):
 						var sDictEntrySuffix = ':Until';
 						break;
 					case (typeof aValues[1] == 'undefined'):
+						var sDictEntrySuffix = ':From';
+						break;
+					case (typeof aValues[0].label == 'undefined' && typeof aValues[1].label == 'undefined'):
+						var sDictEntrySuffix = ':All';
+						break;
+					case (typeof aValues[0].label == 'undefined' ):
+						var sDictEntrySuffix = ':Until';
+						break;
 					case (typeof aValues[1].label == 'undefined' ):
+						var sDictEntrySuffix = ':From';
+						break;
+					case (aValues[0].label.trim() == '' && aValues[1].label.trim() == ''):
+						var sDictEntrySuffix = ':All';
+						break;
+					case (aValues[0].label.trim() == '' ):
+						var sDictEntrySuffix = ':Until';
+						break;
 					case (aValues[1].label.trim() == ''):
 						var sDictEntrySuffix = ':From';
 						break;