From 767b77aa54ef18015f4d21d21a3526c471d0bd70 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 4 Mar 2021 15:36:46 +0200 Subject: [PATCH] fix missing "Select one" option for group-members --- calendar/inc/class.calendar_uiforms.inc.php | 29 +++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php index 2ff5f715b1..0311680a9e 100644 --- a/calendar/inc/class.calendar_uiforms.inc.php +++ b/calendar/inc/class.calendar_uiforms.inc.php @@ -1780,7 +1780,7 @@ class calendar_uiforms extends calendar_ui { 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']; // 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 * - * @param $event - * @param $content - * @param $readonlys - * @param $preserv - * @param $view + * @param array $event + * @param array $content + * @param array $sel_options + * @param array $readonlys + * @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; foreach($event['participant_types'] as $type => $participants) @@ -3504,15 +3505,15 @@ class calendar_uiforms extends calendar_ui } $content = array(); - $this->setup_participants($event, $content, $readonlys,$preserve,true); + $sel_options = array( + 'recur_type' => &$this->bo->recur_types, + 'status' => $this->bo->verbose_status, + 'duration' => $this->durations, + 'role' => $this->bo->roles + ); + $this->setup_participants($event, $content, $sel_options, $readonlys,$preserve,true); $content = array_merge($event, $content); - $sel_options = array( - 'recur_type' => &$this->bo->recur_types, - 'status' => $this->bo->verbose_status, - 'duration' => $this->durations, - 'role' => $this->bo->roles - ); $readonlys = []; $etpl = new Etemplate('calendar.notify_dialog');