Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved organizer handling on a shared event (Bifrost#T23218)

Browse source 
- In event preview display organizer (if its different than the current user)
- In event edit make sure the organizer is listed on organizer identities selector
  in Attendees tab
This commit is contained in:
Aleksander Machniak 2017-02-08 19:14:34 +01:00
parent edf07aa32c
commit 0d02866be6
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
plugins/calendar/calendar_ui.js
View file

@ -515,13 +515,13 @@ function rcube_calendar_ui(settings)
return (j - k); return (j - k);
}); });
var data, mystatus = null, rsvp, line, morelink, html = '', overflow = ''; var data, mystatus = null, rsvp, line, morelink, html = '', overflow = '',
organizer = is_organizer(event);
for (var j=0; j < event.attendees.length; j++) { for (var j=0; j < event.attendees.length; j++) {
data = event.attendees[j]; data = event.attendees[j];
if (data.email) { if (data.email) {
if (data.role == 'ORGANIZER') if (data.role != 'ORGANIZER' && settings.identity.emails.indexOf(';'+data.email) >= 0) {
organizer = true;
else if (settings.identity.emails.indexOf(';'+data.email) >= 0) {
mystatus = data.status.toLowerCase(); mystatus = data.status.toLowerCase();
if (data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE' || data.rsvp) if (data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE' || data.rsvp)
rsvp = mystatus; rsvp = mystatus;
@ -570,7 +570,7 @@ function rcube_calendar_ui(settings)
.text(rcmail.gettext('status' + mystatus, 'libcalendaring')); .text(rcmail.gettext('status' + mystatus, 'libcalendaring'));
} }
var show_rsvp = rsvp && !is_organizer(event) && event.status != 'CANCELLED' && has_permission(calendar, 'v'); var show_rsvp = rsvp && !organizer && event.status != 'CANCELLED' && has_permission(calendar, 'v');
$('#event-rsvp')[(show_rsvp ? 'show' : 'hide')](); $('#event-rsvp')[(show_rsvp ? 'show' : 'hide')]();
$('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true); $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true);
@ -793,7 +793,7 @@ function rcube_calendar_ui(settings)
var load_attendees_tab = function() var load_attendees_tab = function()
{ {
var j, data, reply_selected = 0; var j, data, organizer_attendee, reply_selected = 0;
if (event.attendees) { if (event.attendees) {
for (j=0; j < event.attendees.length; j++) { for (j=0; j < event.attendees.length; j++) {
data = event.attendees[j]; data = event.attendees[j];
@ -805,6 +805,9 @@ function rcube_calendar_ui(settings)
add_attendee(data, !allow_invitations); add_attendee(data, !allow_invitations);
if (allow_invitations && data.role != 'ORGANIZER' && !data.noreply) if (allow_invitations && data.role != 'ORGANIZER' && !data.noreply)
reply_selected++; reply_selected++;
if (data.role == 'ORGANIZER')
organizer_attendee = data;
} }
} }
@ -820,6 +823,15 @@ function rcube_calendar_ui(settings)
return false; return false;
} }
}); });
// In case the user is not the (shared) event organizer we'll add the organizer to the selection list
if (!identity_id && !organizer && organizer_attendee) {
var organizer_name = organizer_attendee.email;
if (organizer_attendee.name)
organizer_name = '"' + organizer_attendee.name + '" <' + organizer_name + '>';
$('#edit-identities-list').append($('<option value="0">').text(organizer_name));
}
$('#edit-identities-list').val(identity_id); $('#edit-identities-list').val(identity_id);
$('#edit-attendees-form')[(allow_invitations?'show':'hide')](); $('#edit-attendees-form')[(allow_invitations?'show':'hide')]();
$('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')](); $('#edit-attendee-schedule')[(calendar.freebusy?'show':'hide')]();