[freeside-commits] branch FREESIDE_3_BRANCH updated. 84b2a1dfba27bc67cb2ff3004cb3885e5b0d5966
Ivan
ivan at 420.am
Mon Jun 5 14:21:06 PDT 2017
The branch, FREESIDE_3_BRANCH has been updated
via 84b2a1dfba27bc67cb2ff3004cb3885e5b0d5966 (commit)
from e41cdc31f1b670808c11f75affc83239a9194647 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 84b2a1dfba27bc67cb2ff3004cb3885e5b0d5966
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Jun 5 14:21:05 2017 -0700
perform 3 character substring searches if you have 'List all customers', RT#75012, RT#76155
diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index 04d97bd..e69e5f2 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -356,10 +356,14 @@ sub smart_search {
#still some false laziness w/search (was search/cust_main.cgi)
+ my $min_len =
+ $FS::CurrentUser::CurrentUser->access_right('List all customers')
+ ? 3 : 4;
+
#substring
my @company_hashrefs = ();
- if ( length($value) >= 4 ) {
+ if ( length($value) >= $min_len ) {
@company_hashrefs = (
{ 'company' => { op=>'ILIKE', value=>"%$value%" }, },
{ 'ship_company' => { op=>'ILIKE', value=>"%$value%" }, },
@@ -375,7 +379,7 @@ sub smart_search {
},
);
- } elsif ( length($value) >= 4 ) {
+ } elsif ( length($value) >= $min_len ) {
@hashrefs = (
{ 'first' => { op=>'ILIKE', value=>"%$value%" }, },
@@ -396,7 +400,7 @@ sub smart_search {
}
- if ( $conf->exists('address1-search') && length($value) >= 4 ) {
+ if ( $conf->exists('address1-search') && length($value) >= $min_len ) {
push @cust_main, qsearch( {
table => 'cust_main',
-----------------------------------------------------------------------
Summary of changes:
FS/FS/cust_main/Search.pm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
More information about the freeside-commits
mailing list