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

Fix search term passed in link

Browse Source
This commit is contained in:
Nathan Gray 2016-03-29 23:34:45 +00:00
parent e58851c50f
commit 0f5ed51075
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/app.js
View File

@ -2126,7 +2126,7 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
state.state.enddate = state.state.enddate.toJSON();
}
state.state.col_filter = {participant: state.state.owner};
state.state.search = state.state.keywords;
state.state.search = state.state.keywords ? state.state.keywords : state.state.search;
var nm = view.etemplates[0].widgetContainer.getWidgetById('nm');
@ -3229,6 +3229,11 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
// Avoid unwanted refresh immediately after load
nm.controller._grid.doInvalidate = false;
// Preserve pre-set search
if(nm.activeFilters.search)
{
this.state.keywords = nm.activeFilters.search;
}
nm.set_startdate = jQuery.proxy(function(date) {
this.state.first = this.date.toString(new Date(date));
},this);