From: Ivan Kohler Date: Tue, 21 Aug 2012 21:15:40 +0000 (-0700) Subject: add preference to enable fuzzy searching even on exact matches, RT#18962 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=fa2326a36a5ce74e8c9dab504c3274688a297c04 add preference to enable fuzzy searching even on exact matches, RT#18962 --- diff --git a/httemplate/misc/xmlhttp-cust_main-search.cgi b/httemplate/misc/xmlhttp-cust_main-search.cgi index 16f7cd2bc..acf7e70e2 100644 --- a/httemplate/misc/xmlhttp-cust_main-search.cgi +++ b/httemplate/misc/xmlhttp-cust_main-search.cgi @@ -10,7 +10,7 @@ % % my $string = $cgi->param('arg'); % my @cust_main = smart_search( 'search' => $string, -% 'no_fuzzy_on_exact' => 1, #pref? +% 'no_fuzzy_on_exact' => ! $FS::CurrentUser::CurrentUser->option('enable_fuzzy_on_exact'), % ); % my $return = [ map [ $_->custnum, % $_->name, diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html index 932cf1a0a..c4fef0311 100644 --- a/httemplate/pref/pref-process.html +++ b/httemplate/pref/pref-process.html @@ -50,6 +50,7 @@ unless ( $error ) { # if ($access_user) { #XXX autogen my @paramlist = qw( locale menu_position default_customer_view spreadsheet_format mobile_menu + enable_fuzzy_on_exact disable_html_editor disable_enter_submit_onetimecharge email_address snom-ip snom-username snom-password diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html index 9ebf2f1ba..575b8045b 100644 --- a/httemplate/pref/pref.html +++ b/httemplate/pref/pref.html @@ -90,7 +90,14 @@ Interface - + + + Enable approximate customer searching even when an exact match is found: + + option('enable_fuzzy_on_exact') ? 'CHECKED' : '' %>> + + + Disable HTML editor for customer notes: diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index a81958e20..7c3ad3384 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -468,9 +468,10 @@ if ( $cgi->param('browse') if ( $cgi->param('search_cust') ) { $sortby = \*company_sort; $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )"; - push @cust_main, smart_search( 'search' => scalar($cgi->param('search_cust')), - 'no_fuzzy_on_exact' => 1, #pref? - ); + push @cust_main, smart_search( + 'search' => scalar($cgi->param('search_cust')), + 'no_fuzzy_on_exact' => ! $curuser->option('enable_fuzzy_on_exact'), + ); } @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main diff --git a/rt/share/html/Elements/AddCustomers b/rt/share/html/Elements/AddCustomers index 9828d7d53..6517db42c 100644 --- a/rt/share/html/Elements/AddCustomers +++ b/rt/share/html/Elements/AddCustomers @@ -41,7 +41,7 @@ my @Customers = (); if ( $CustomerString ) { @Customers = &RT::URI::freeside::smart_search( 'search' => $CustomerString, - 'no_fuzzy_on_exact' => 1, #pref? + 'no_fuzzy_on_exact' => ! $FS::CurrentUser::CurrentUser->option('enable_fuzzy_on_exact'), ); } diff --git a/rt/share/html/Ticket/Elements/AddCustomers b/rt/share/html/Ticket/Elements/AddCustomers index 3c2c82add..13fb2f010 100644 --- a/rt/share/html/Ticket/Elements/AddCustomers +++ b/rt/share/html/Ticket/Elements/AddCustomers @@ -58,7 +58,7 @@ my @Customers = (); if ( $CustomerString ) { @Customers = &RT::URI::freeside::smart_search( 'search' => $CustomerString, - 'no_fuzzy_on_exact' => 1, #pref? + 'no_fuzzy_on_exact' => ! $FS::CurrentUser::CurrentUser->option('enable_fuzzy_on_exact'), ); }