plugins/calendar
Thomas Brüderli
bruederli at kolabsys.com
Mon Feb 9 15:11:19 CET 2015
plugins/calendar/lib/calendar_ui.php | 6 +++++-
plugins/calendar/skins/classic/templates/itipattend.html | 2 +-
plugins/calendar/skins/larry/templates/itipattend.html | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit ad67a1c7b9007f45a7b450b0192700228c9cf8a9
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Mon Feb 9 15:11:01 2015 +0100
List the right RSVP buttons according to the context; follow-up fix for #4447
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 66dc51d..6fcdb3c 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -886,7 +886,11 @@ class calendar_ui
function event_rsvp_buttons($attrib = array())
{
- return $this->cal->itip->itip_rsvp_buttons($attrib);
+ $actions = array('accepted','tentative','declined');
+ if ($attrib['delegate'] !== 'false')
+ $actions[] = 'delegated';
+
+ return $this->cal->itip->itip_rsvp_buttons($attrib, $actions);
}
}
diff --git a/plugins/calendar/skins/classic/templates/itipattend.html b/plugins/calendar/skins/classic/templates/itipattend.html
index 84968b5..f4290d8 100644
--- a/plugins/calendar/skins/classic/templates/itipattend.html
+++ b/plugins/calendar/skins/classic/templates/itipattend.html
@@ -13,7 +13,7 @@
<div class="centerbox">
<roundcube:object name="plugin.event_inviteform" />
<roundcube:object name="plugin.event_invitebox" class="calendar-invitebox" />
- <roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" />
+ <roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" delegate="false" />
</form>
</div>
diff --git a/plugins/calendar/skins/larry/templates/itipattend.html b/plugins/calendar/skins/larry/templates/itipattend.html
index 0ca14ff..545d018 100644
--- a/plugins/calendar/skins/larry/templates/itipattend.html
+++ b/plugins/calendar/skins/larry/templates/itipattend.html
@@ -25,7 +25,7 @@
<div class="centerbox uibox">
<roundcube:object name="plugin.event_inviteform" />
<roundcube:object name="plugin.event_invitebox" class="calendar-invitebox" />
- <roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" />
+ <roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" delegate="false" />
</form>
</div>
More information about the commits
mailing list