extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge startdate and enddate to activeFilters. if set

Browse Source
This commit is contained in:
Klaus Leithoff 2016-04-12 13:37:38 +00:00
parent bb22925e3e
commit 5f7eab435b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/js/app.js
View File

@ -2109,7 +2109,11 @@ app.classes.mail = AppJS.extend(
var obj_manager = egw_getObjectManager(this.appname).getObjectById(this.nm_index); var obj_manager = egw_getObjectManager(this.appname).getObjectById(this.nm_index);
if (obj_manager && obj_manager.manager && obj_manager.manager.data && obj_manager.manager.data.nextmatch && obj_manager.manager.data.nextmatch.activeFilters) if (obj_manager && obj_manager.manager && obj_manager.manager.data && obj_manager.manager.data.nextmatch && obj_manager.manager.data.nextmatch.activeFilters)
{ {
return obj_manager.manager.data.nextmatch.activeFilters; var af = obj_manager.manager.data.nextmatch.activeFilters;
// merge startdate and enddate into the active filters (if set)
if (this.et2.getWidgetById('startdate') && this.et2.getWidgetById('startdate').get_value()) af["startdate"] = this.et2.getWidgetById('startdate').date;
if (this.et2.getWidgetById('enddate') && this.et2.getWidgetById('enddate').get_value()) af["enddate"] = this.et2.getWidgetById('enddate').date;
return af;
} }
return false; return false;
}, },