extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing participant names in sidebox & listview

Browse Source
This commit is contained in:
Nathan Gray 2015-12-14 18:38:53 +00:00
parent 5b65b12b1e
commit 3dfc697c7c
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/js/app.js
View File

@ -1845,7 +1845,7 @@ app.classes.calendar = AppJS.extend(
}
}
var value = [{start_date: state.state.first, end_date: state.state.last}];
if(state.state.view !== 'listview') this._need_data(value,state.state);
this._need_data(value,state.state);
}
// Include first & last dates in state, mostly for server side processing
if(state.state.first && state.state.first.toJSON) state.state.first = state.state.first.toJSON();
@ -2383,21 +2383,41 @@ app.classes.calendar = AppJS.extend(
// Merge in new, update label of existing
for(var i in data.rows.sel_options[field])
{
var found = false;
var option = data.rows.sel_options[field][i];
for(var j in widget.options.select_options)
{
if(option.value == widget.options.select_options[j].value)
{
widget.options.select_options[j].label = option.label;
found = true;
break;
}
}
if(!found)
{
widget.options.select_options.push(option);
}
}
var in_progress = app.calendar.state_update_in_progress;
app.calendar.state_update_in_progress = true;
widget.set_select_options(widget.options.select_options);
widget.set_value(widget.getValue());
// If updating owner, update listview participants as well
// This lets us _add_ to the options, normal nm behaviour will replace.
if(field == 'owner')
{
try {
var participant = app.classes.calendar.views.listview.etemplates[0].widgetContainer.getWidgetById('nm').getWidgetById('participant');
if(participant)
{
participant.options.select_options = widget.options.select_options;
participant.set_select_options(widget.options.select_options);
}
} catch(e) {debugger;}
}
app.calendar.state_update_in_progress = in_progress;
}
}