holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix delete of series did not work

Browse Source
This commit is contained in:
Nathan Gray 2015-11-16 16:45:02 +00:00
parent 7c944b5aeb
commit 98c18b04ec
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -968,12 +968,10 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
}
break;
case 'delete': // delete of regular event
case 'delete_keep_exceptions': // series and user selected to keep the exceptions
case 'delete_exceptions': // series and user selected to delete the exceptions too
case 'delete': // delete of event (regular or series)
$exceptions_kept = null;
if ($this->bo->delete($event['id'], (int)$content['edit_single'], false, $event['no_notifications'],
$button == 'delete_exceptions', $exceptions_kept))
$content['delete_exceptions'] == 'true', $exceptions_kept))
{
if ($event['recur_type'] != MCAL_RECUR_NONE && $content['reference'] == 0 && !$content['edit_single'])
{

3
calendar/js/app.js
View File

@ -1013,7 +1013,8 @@ app.classes.calendar = AppJS.extend(
{
if (_button_id != 'dialog[cancel]')
{
self.et2._inst.submit(_button_id);
widget.getRoot().getWidgetById('delete_exceptions').set_value(_button_id == 'button[delete_exceptions]');
widget.getInstanceManager().submit('button[delete]');
return true;
}
else

1
calendar/templates/default/edit.xet
View File

@ -318,6 +318,7 @@
</menulist>
<checkbox label="Do not notify" id="no_notifications"/>
<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="app.calendar.delete_btn(widget,$cont[query_delete_exceptions]);" image="delete" background_image="1"/>
<textbox type="hidden" id="delete_exceptions"/>
</hbox>
</template>
</overlay>