diff options
author | Ivan Kohler <ivan@freeside.biz> | 2013-09-05 21:05:16 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2013-09-05 21:05:16 -0700 |
commit | 7ff74aec7c627cfff90e6746081fcf011e62508b (patch) | |
tree | 37d7e5d91c2e442f800202712e2f306e8919e8a6 | |
parent | 9c689ebc5dee1cada21e95b1b29a29ea54247e77 (diff) |
add no_fuzzy_on_exact global, RT#24804
-rw-r--r-- | httemplate/pref/pref.html | 8 | ||||
-rwxr-xr-x | httemplate/search/cust_main.cgi | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html index 5babb0181..626f46552 100644 --- a/httemplate/pref/pref.html +++ b/httemplate/pref/pref.html @@ -106,6 +106,12 @@ Interface </TD> </TR> +% if ( FS::Conf->new->exists('enable_fuzzy_on_exact') ) { + + <INPUT TYPE="hidden" NAME="enable_fuzzy_on_exact" VALUE="<% $curuser->option('enable_fuzzy_on_exact') ? 1 : 0 %>"> + +% } else { + <TR> <TH ALIGN="right" COLSPAN=1>Enable approximate customer searching <BR>even when an exact match is found: </TH> <TD ALIGN="left" COLSPAN=2> @@ -113,6 +119,8 @@ Interface </TD> </TR> +% } + <TR> <TH ALIGN="right" COLSPAN=1>Disable HTML editor for customer notes: </TH> <TD ALIGN="left" COLSPAN=2> diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi index 2c09c692c..69f04f5e1 100755 --- a/httemplate/search/cust_main.cgi +++ b/httemplate/search/cust_main.cgi @@ -470,7 +470,9 @@ if ( $cgi->param('browse') $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )"; push @cust_main, smart_search( 'search' => scalar($cgi->param('search_cust')), - 'no_fuzzy_on_exact' => ! $curuser->option('enable_fuzzy_on_exact'), + 'no_fuzzy_on_exact' => ! ( $curuser->option('enable_fuzzy_on_exact') + || $conf->exists('enable_fuzzy_on_exact') + ), ); } |