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

fix missing "Select one" option for group-members

Browse Source
This commit is contained in:
Ralf Becker 2021-03-04 15:36:46 +02:00
parent 9ecd48fff4
commit ebbff0951d
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1780,7 +1780,7 @@ class calendar_uiforms extends calendar_ui
{ {
if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n]; if (isset($event['participants'][$n])) $content['participants'][$n] = $event['participants'][$n];
} }
$this->setup_participants($event,$content,$readonlys,$preserv,$view); $this->setup_participants($event,$content,$sel_options, $readonlys,$preserv,$view);
$content['participants']['status_date'] = $preserv['actual_date']; $content['participants']['status_date'] = $preserv['actual_date'];
// set notify_externals in participants from cfs // set notify_externals in participants from cfs
@ -1973,13 +1973,14 @@ class calendar_uiforms extends calendar_ui
/** /**
* Set up the participants for display in edit dialog * Set up the participants for display in edit dialog
* *
* @param $event * @param array $event
* @param $content * @param array $content
* @param $readonlys * @param array $sel_options
* @param $preserv * @param array $readonlys
* @param $view * @param array $preserv
* @param string $view
*/ */
protected function setup_participants($event, &$content, &$readonlys, &$preserv, $view) protected function setup_participants(array $event, array &$content, array &$sel_options, array &$readonlys, array &$preserv, $view)
{ {
$row = 3; $row = 3;
foreach($event['participant_types'] as $type => $participants) foreach($event['participant_types'] as $type => $participants)
@ -3504,15 +3505,15 @@ class calendar_uiforms extends calendar_ui
} }
$content = array(); $content = array();
$this->setup_participants($event, $content, $readonlys,$preserve,true);
$content = array_merge($event, $content);
$sel_options = array( $sel_options = array(
'recur_type' => &$this->bo->recur_types, 'recur_type' => &$this->bo->recur_types,
'status' => $this->bo->verbose_status, 'status' => $this->bo->verbose_status,
'duration' => $this->durations, 'duration' => $this->durations,
'role' => $this->bo->roles 'role' => $this->bo->roles
); );
$this->setup_participants($event, $content, $sel_options, $readonlys,$preserve,true);
$content = array_merge($event, $content);
$readonlys = []; $readonlys = [];
$etpl = new Etemplate('calendar.notify_dialog'); $etpl = new Etemplate('calendar.notify_dialog');