holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Calendar: Make sure search from sidebox doesn't come back in list view after being cleared

Browse Source
This commit is contained in:
nathangray 2019-11-25 15:46:36 -07:00
parent ffecac79fd
commit 01da1c3bd4
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calendar/inc/class.calendar_uilist.inc.php
View File

@ -172,10 +172,12 @@ class calendar_uilist extends calendar_ui
{ {
$this->adjust_for_search($params['keywords'], $content['nm']); $this->adjust_for_search($params['keywords'], $content['nm']);
} }
unset($params['keywords']);
} }
if (isset($_REQUEST['keywords'])) // new search => set filters so every match is shown if (isset($_REQUEST['keywords'])) // new search => set filters so every match is shown
{ {
$this->adjust_for_search($_REQUEST['keywords'],$content['nm']); $this->adjust_for_search($_REQUEST['keywords'],$content['nm']);
unset($_REQUEST['keywords']);
} }
$sel_options['filter'] = &$this->date_filters; $sel_options['filter'] = &$this->date_filters;

2
calendar/js/app.js
View File

@ -2693,7 +2693,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
} }
state.state.col_filter = {participant: state.state.owner}; state.state.col_filter = {participant: state.state.owner};
state.state.search = state.state.keywords ? state.state.keywords : state.state.search; state.state.search = state.state.keywords ? state.state.keywords : state.state.search;
delete state.state.keywords;
var nm = view.etemplates[0].widgetContainer.getWidgetById('nm'); var nm = view.etemplates[0].widgetContainer.getWidgetById('nm');