From e40f6ff731dd3034287e3faa63db88b5e5d58ad0 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 16 Mar 2015 09:08:35 +0100 Subject: [PATCH] Fix group visibility see BT#9425 --- main/attendance/attendance_calendar.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/main/attendance/attendance_calendar.php b/main/attendance/attendance_calendar.php index 0a69e47f6b..3bfba6312a 100755 --- a/main/attendance/attendance_calendar.php +++ b/main/attendance/attendance_calendar.php @@ -47,13 +47,14 @@ if (isset($error_checkdate) && $error_checkdate) { Display::display_error_message($message, false); } -$groupList = GroupManager::get_group_list(null, null, 1); -$groupIdList = array('--'); -foreach ($groupList as $group) { - $groupIdList[$group['id']] = $group['name']; -} if (isset($action) && $action == 'calendar_add') { + $groupList = GroupManager::get_group_list(null, null, 1); + $groupIdList = array('--'); + foreach ($groupList as $group) { + $groupIdList[$group['id']] = $group['name']; + } + // calendar add form $form = new FormValidator( 'attendance_calendar_add', @@ -104,6 +105,12 @@ if (isset($action) && $action == 'calendar_add') { } else { // Calendar list + $groupList = GroupManager::get_group_list(); + $groupIdList = array('--'); + foreach ($groupList as $group) { + $groupIdList[$group['id']] = $group['name']; + } + echo Display::page_subheader(get_lang('CalendarList')); echo '
'; if (!empty($attendance_calendar)) { @@ -131,8 +138,10 @@ if (isset($action) && $action == 'calendar_add') { echo '
'; } else { echo Display::return_icon( - 'lp_calendar_event.png', get_lang('DateTime') + 'lp_calendar_event.png', + get_lang('DateTime') ).' '.substr($calendar['date_time'], 0, strlen($calendar['date_time'])- 3) .' '; + if (isset($calendar['groups']) && !empty($calendar['groups'])) { foreach ($calendar['groups'] as $group) { echo ' '.Display::label($groupIdList[$group['group_id']]);