* Addressbook - Fix bug preventing turning off letter filter after some actions

This commit is contained in:
nathangray 2018-07-18 13:43:32 -06:00
parent 8092e1fb86
commit d5e0bc1615
2 changed files with 3 additions and 3 deletions

View File

@ -1562,7 +1562,7 @@ window.egw_LAB.wait(function() {
{ {
if(!is_numeric($key)) continue; if(!is_numeric($key)) continue;
if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like']. if(preg_match('/'.$GLOBALS['egw']->db->capabilities['case_insensitive_like'].
' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/',$col_filter) == 1 ' '.$GLOBALS['egw']->db->quote('[a-z]%').'$/i',$col_filter) == 1
) )
{ {
unset($query['col_filter'][$key]); unset($query['col_filter'][$key]);

View File

@ -2859,10 +2859,10 @@ var et2_nextmatch_header_bar = (function(){ "use strict"; return et2_DOMWidget.e
if(this.nextmatch.options.settings.lettersearch) if(this.nextmatch.options.settings.lettersearch)
{ {
jQuery("td",this.lettersearch).removeClass("lettersearch_active"); jQuery("td",this.lettersearch).removeClass("lettersearch_active");
jQuery(filters.searchletter ? "td#"+filters.searchletter : "td.lettersearch[id='']").addClass("lettersearch_active"); jQuery(filters.searchletter ? "td#"+filters.searchletter : "td.lettersearch[id='']",this.lettersearch).addClass("lettersearch_active");
// Set activeFilters to current value // Set activeFilters to current value
filters.searchletter = jQuery("td.lettersearch_active").attr("id"); filters.searchletter = jQuery("td.lettersearch_active",this.lettersearch).attr("id") || false;
} }
// Reset flag // Reset flag