summaryrefslogtreecommitdiff
path: root/plugins/libcalendaring
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2014-11-06 11:06:51 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2014-11-06 16:09:59 (GMT)
commitc26f9d25cba791ec5e4735e4c7a14ee1c1b30469 (patch)
tree975e904689694ba83621b51631e7526cccec1cdd /plugins/libcalendaring
parent4a150a21390f367f2d68fa8e638b1185fa5c8614 (diff)
downloadroundcubemail-plugins-kolab-c26f9d25cba791ec5e4735e4c7a14ee1c1b30469.tar.gz
Some fixes to the iTip delegation functions
Diffstat (limited to 'plugins/libcalendaring')
-rw-r--r--plugins/libcalendaring/lib/libcalendaring_itip.php4
-rw-r--r--plugins/libcalendaring/libcalendaring.js3
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/libcalendaring/lib/libcalendaring_itip.php b/plugins/libcalendaring/lib/libcalendaring_itip.php
index e9be25d..9403f46 100644
--- a/plugins/libcalendaring/lib/libcalendaring_itip.php
+++ b/plugins/libcalendaring/lib/libcalendaring_itip.php
@@ -262,6 +262,7 @@ class libcalendaring_itip
*
* @param array Event object to delegate
* @param mixed Delegatee as string or hash array with keys 'name' and 'mailto'
+ * @param boolean The delegator's RSVP flag
* @return boolean True on success, False on failure
*/
public function delegate_to(&$event, $delegate, $rsvp = false)
@@ -301,6 +302,7 @@ class libcalendaring_itip
$delegate_index = $i;
break;
}
+ // TODO: remove previous delegatee (i.e. attendee that has DELEGATED-FROM == $me)
}
// set/add delegate attendee with RSVP=TRUE and DELEGATED-FROM parameter
@@ -635,7 +637,7 @@ class libcalendaring_itip
// add localized texts for the delegation dialog
if (in_array('delegated', $actions)) {
foreach (array('itipdelegated','itipcomment','delegateinvitation',
- 'delegateto','delegatersvpme','delegateinvalidaddress') as $label) {
+ 'delegateto','delegatersvpme','delegateinvalidaddress','cancel') as $label) {
$this->rc->output->command('add_label', "itip.$label", $this->gettext($label));
}
}
diff --git a/plugins/libcalendaring/libcalendaring.js b/plugins/libcalendaring/libcalendaring.js
index bb5a66f..f06b55a 100644
--- a/plugins/libcalendaring/libcalendaring.js
+++ b/plugins/libcalendaring/libcalendaring.js
@@ -916,7 +916,8 @@ rcube_libcalendaring.itip_delegate_dialog = function(callback, selector)
rcm.env.recipients_delimiter = '';
},
close: function(event, ui) {
- rcmail.ksearch_blur();
+ rcm = rcmail.is_framed() ? parent.rcmail : rcmail;
+ rcm.ksearch_blur();
$(this).remove();
}
});