From 1494c186603cf28d3f260c3e17b666aec75da390 Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 5 Mar 2018 17:15:49 -0800 Subject: [PATCH] Admin-UI: Added "Is Empty" option to type=number when filter is true. --- e107_handlers/admin_ui.php | 9 +++++++++ e107_languages/English/admin/lan_admin.php | 11 ++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index d2b42535b8..cc92a5f3fe 100755 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -4058,6 +4058,7 @@ protected function _modifyListQry($raw = false, $isfilter = false, $forceFrom = { $searchQry[] = $this->fields[$filterField]['__tableField']." = '' "; } + else { @@ -7077,6 +7078,14 @@ function renderBatchFilter($type='batch', $selected = '') // Common function use break; + case 'number'; + if($type === 'filter') + { + $option[$key.'___ISEMPTY_'] = LAN_UI_FILTER_IS_EMPTY; + } + + break; + case 'bool': case 'boolean': //TODO modify description based on $val['parm] if(vartrue($parms['reverse'])) // reverse true/false values; diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php index 2acdf2817f..115eab3c72 100644 --- a/e107_languages/English/admin/lan_admin.php +++ b/e107_languages/English/admin/lan_admin.php @@ -487,11 +487,6 @@ define("LAN_UI_FILTER_PAST_MONTH", "Past Month"); define("LAN_UI_FILTER_PAST_YEAR", "Past Year"); -define("LAN_UI_FILTER_NEXT_HOUR", "Next Hour"); -define("LAN_UI_FILTER_NEXT_24_HOURS", "Next 24 hours"); -define("LAN_UI_FILTER_NEXT_WEEK", "Next Week"); -define("LAN_UI_FILTER_NEXT_MONTH", "Next Month"); -define("LAN_UI_FILTER_NEXT_YEAR", "Next Year"); define("LAN_USER_MANAGEALL", "Manage all User, Userclass and Extended User-Field settings"); define("LAN_USER_LIST", "User List"); @@ -550,3 +545,9 @@ define("LAN_UI_VIEW_LIST_LABEL", "List view"); define("LAN_CHECKING_FOR_UPDATES", "Checking for updates"); +define("LAN_UI_FILTER_NEXT_HOUR", "Next Hour"); +define("LAN_UI_FILTER_NEXT_24_HOURS", "Next 24 hours"); +define("LAN_UI_FILTER_NEXT_WEEK", "Next Week"); +define("LAN_UI_FILTER_NEXT_MONTH", "Next Month"); +define("LAN_UI_FILTER_NEXT_YEAR", "Next Year"); +define("LAN_UI_FILTER_IS_EMPTY", "Is Empty");