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

List the right RSVP buttons according to the context; follow-up fix for #4447

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-09 15:11:01 +01:00
parent 91a484a713
commit ad67a1c7b9
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/calendar/lib/calendar_ui.php
View file

@ -886,7 +886,11 @@ class calendar_ui
function event_rsvp_buttons($attrib = array()) 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);
} }
} }

2
plugins/calendar/skins/classic/templates/itipattend.html
View file

@ -13,7 +13,7 @@
<div class="centerbox"> <div class="centerbox">
<roundcube:object name="plugin.event_inviteform" /> <roundcube:object name="plugin.event_inviteform" />
<roundcube:object name="plugin.event_invitebox" class="calendar-invitebox" /> <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> </form>
</div> </div>

2
plugins/calendar/skins/larry/templates/itipattend.html
View file

@ -25,7 +25,7 @@
<div class="centerbox uibox"> <div class="centerbox uibox">
<roundcube:object name="plugin.event_inviteform" /> <roundcube:object name="plugin.event_inviteform" />
<roundcube:object name="plugin.event_invitebox" class="calendar-invitebox" /> <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> </form>
</div> </div>