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

Planner view

Browse Source 
- Fix missing rows with planner by user, group selected
This commit is contained in:
Nathan Gray 2015-12-17 23:13:26 +00:00
parent c3900b27a4
commit db071039a4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/js/et2_widget_planner.js
View File

@ -629,7 +629,10 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
for(var i = labels.length -1; i >= 0; i--) for(var i = labels.length -1; i >= 0; i--)
{ {
labels[i].id = labels[i].value; labels[i].id = labels[i].value;
labels[i].data = {cat_id: labels[i].id}; labels[i].data = {
cat_id: labels[i].id,
main: labels[i].value==labels[i].main
};
} }
return labels; return labels;
}, },
@ -802,7 +805,7 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
this.headers.empty(); this.headers.empty();
this.headerTitle.text(grouper.title.apply(this)); this.headerTitle.text(grouper.title.apply(this));
grouper.headers.apply(this); grouper.headers.apply(this);
// Get the rows / labels // Get the rows / labels
var labels = grouper.row_labels.call(this); var labels = grouper.row_labels.call(this);
@ -819,9 +822,12 @@ var et2_calendar_planner = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResize
// Draw the rows // Draw the rows
for(var key in labels) for(var key in labels)
{ {
if((!app.calendar.state.cat_id || app.calendar.state.cat_id == '') && labels[key].id != labels[key].main) // Skip sub-categories (events are merged into top level)
if(this.options.group_by == 'category' &&
(!app.calendar.state.cat_id || app.calendar.state.cat_id == '') &&
labels[key].id != labels[key].main
)
{ {
// Skip sub-categories (events are merged into top level)
continue; continue;
} }
var row = grouper.draw_row.call(this,labels[key].id, labels[key].label, events[key] || []); var row = grouper.draw_row.call(this,labels[key].id, labels[key].label, events[key] || []);