From: <nat...@us...> - 2015-11-24 17:21:44
|
Author: nathangray Date: Tue Nov 24 18:21:37 2015 New Revision: 54368 URL: http://svn.stylite.de/viewvc/egroupware?rev=54368&view=rev Log: Make sure listview start & end dates stay valid Modified: trunk/calendar/js/app.js trunk/calendar/templates/default/list.xet Modified: trunk/calendar/js/app.js URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/js/app.js?rev=54368&r1=54367&r2=54368&view=diff ============================================================================== --- trunk/calendar/js/app.js (original) +++ trunk/calendar/js/app.js Tue Nov 24 18:21:37 2015 @@ -1592,7 +1592,11 @@ delete state.date; delete state.first; delete state.last; - + delete state.startdate; + delete state.enddate; + delete state.start_date; + delete state.end_date; + return state; }, @@ -1895,10 +1899,18 @@ if(state.state.view === 'listview') { state.state.startdate = state.state.date; + if(state.state.startdate.toJSON) + { + state.state.startdate = state.state.startdate.toJSON(); + } if(state.state.end_date) { state.state.enddate = state.state.end_date; + } + if(state.state.enddate && state.state.enddate.toJSON) + { + state.state.enddate = state.state.enddate.toJSON(); } state.state.col_filter = {participant: state.state.owner}; state.state.search = state.state.keywords; @@ -1908,6 +1920,16 @@ delete state.state.filter; var nm = view.etemplates[0].widgetContainer.getWidgetById('nm'); + + // 'Custom' filter needs an end date + if(nm.activeFilters.filter === 'custom' && !state.state.end_date) + { + state.state.enddate = state.state.last; + } + if(state.state.enddate && state.state.startdate && state.state.startdate > state.state.enddate) + { + state.state.enddate = state.state.startdate; + } nm.applyFilters(state.state); if(!state.state.end_date && nm.activeFilters.enddate) { Modified: trunk/calendar/templates/default/list.xet URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/list.xet?rev=54368&r1=54367&r2=54368&view=diff ============================================================================== --- trunk/calendar/templates/default/list.xet (original) +++ trunk/calendar/templates/default/list.xet Tue Nov 24 18:21:37 2015 @@ -5,9 +5,9 @@ <template id="calendar.list.dates" template="" lang="" group="0" version="1.3.001"> <hbox> <description value="Start"/> - <date id="startdate"/> + <date id="startdate" onchange="app.calendar.update_state({date: widget.getValue()}); return false;"/> <description value="End"/> - <date id="enddate"/> + <date id="enddate" onchange="app.calendar.update_state({end_date: widget.getValue()}); return false;"/> </hbox> </template> <template id="calendar.list.rows" template="" lang="" group="0" version="1.9.004"> |