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

Calendar - make sure everything closes after you click 'Ignore conflict' on the popup after using quick event add

Browse Source
This commit is contained in:
nathangray 2019-06-24 09:56:18 -06:00
parent 2a0415561d
commit 4058d0f659
1 changed files with 5 additions and 1 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

@ -1448,6 +1448,10 @@ class calendar_uiforms extends calendar_ui
$this->edit();
}
/**
* Get conflict dialog via ajax. Used by quick add.
*
*/
public function ajax_conflicts()
{
$participants = json_decode($_GET['participants'],true);
@ -1470,7 +1474,7 @@ class calendar_uiforms extends calendar_ui
);
}
$content['participants'] = $participants;
$content['button'] = array('apply' => true);
$content['button'] = array('save' => true);
return $this->process_edit($content);
}