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

Fix 4 day view to follow week consolidation rules

Browse Source
This commit is contained in:
Nathan Gray 2016-03-29 14:52:40 +00:00
parent d5c9994d50
commit 6d2e461a83
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
calendar/js/app.js
View File

@ -1852,9 +1852,9 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
switch(state.state.view) switch(state.state.view)
{ {
case 'day': case 'day':
case 'day4':
grid_count = 1 grid_count = 1
break; break;
case 'day4':
case 'week': case 'week':
grid_count = state.state.owner.length >= parseInt(this.egw.preference('week_consolidate','calendar')) ? 1 : state.state.owner.length; grid_count = state.state.owner.length >= parseInt(this.egw.preference('week_consolidate','calendar')) ? 1 : state.state.owner.length;
break; break;
@ -1879,7 +1879,10 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
var date = new Date(state.state.first); var date = new Date(state.state.first);
// Hide all but the first day header // Hide all but the first day header
$j(grid.getDOMNode()).toggleClass('hideDayColHeader',state.state.view == 'week'); $j(grid.getDOMNode()).toggleClass(
'hideDayColHeader',
state.state.view == 'week' || state.state.view == 'day4'
);
// Determine the different end date & varying values // Determine the different end date & varying values
switch(state.state.view) switch(state.state.view)