Fix select_ajax usages on course list/edit/request_edit and session list

main/admin/course_edit.php

@@ -173,24 +173,21 @@ if (!empty($coursesInSession)) {
 
 // Category code
 $url = api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=search_category';
-$categoryList = array();
 
-if (!empty($courseInfo['categoryCode'])) {
-    $data = getCategory($courseInfo['categoryCode']);
-    $categoryList[$data['code']] = $data['name'];
-}
-
-$form->addElement(
+$categorySelect = $form->addElement(
     'select_ajax',
     'category_code',
     get_lang('CourseFaculty'),
     null,
-    array(
-        'url' => $url,
-        'defaults' => $categoryList
-    )
+    array('url' => $url)
 );
 
+if (!empty($courseInfo['categoryCode'])) {
+    $data = getCategory($courseInfo['categoryCode']);
+
+    $categorySelect->addOption($data['name'], $data['code']);
+}
+
 $form->addText('department_name', get_lang('CourseDepartment'), false, array('size' => '60'));
 $form->applyFilter('department_name', 'html_filter');
 $form->applyFilter('department_name', 'trim');

main/admin/course_list.php

@@ -373,22 +373,19 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
     // Create a filter by session
     $sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
     $url = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=search_session';
-    $sessionList = array();
-    if (!empty($sessionId)) {
-        $sessionList = array();
-        $sessionInfo = SessionManager::fetch($sessionId);
-        $sessionList[$sessionInfo['id']] = $sessionInfo['name'];
-    }
-    $sessionFilter->addElement(
+    $sessionSelect = $sessionFilter->addElement(
         'select_ajax',
         'session_name',
         get_lang('SearchCourseBySession'),
         null,
-        array(
-            'url' => $url,
-            'defaults' => $sessionList
-        )
+        array('url' => $url)
     );
+
+    if (!empty($sessionId)) {
+        $sessionInfo = SessionManager::fetch($sessionId);
+        $sessionSelect->addOption($sessionInfo['name'], $sessionInfo['id'], ['selected' => 'selected']);
+    }
+    
     $courseListUrl = api_get_self();
     $actions .= '<div class="row">';
     $actions .= '<div class="col-md-2">';
@@ -413,8 +410,13 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
     <script>
     $(function() {
         $("#session_name").on("change", function() {
-           var sessionId = $(this).val();
-           window.location = "'.$courseListUrl.'?session_id="+sessionId;
+            var sessionId = $(this).val();
+
+            if (!sessionId) {
+                return;
+            }
+
+            window.location = "'.$courseListUrl.'?session_id="+sessionId;
         });
     });
     </script>';

main/admin/course_request_edit.php

@@ -48,24 +48,20 @@ if ($course_validation_feature) {
         // Course category.
         $url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_category';
 
-        $categoryList = array();
-
-        if (!empty($course_request_info['category_code'])) {
-            $data = getCategory($course_request_info['category_code']);
-            $categoryList[$data['code']] = $data['name'];
-        }
-
-        $form->addElement(
+        $courseSelect = $form->addElement(
             'select_ajax',
             'category_code',
             get_lang('CourseFaculty'),
             null,
-            array(
-                'url' => $url,
-                'defaults' => $categoryList
-            )
+            array('url' => $url)
         );
 
+        if (!empty($course_request_info['category_code'])) {
+            $data = getCategory($course_request_info['category_code']);
+
+            $courseSelect->addOption($data['name'], $data['code'], ['selected' => 'selected']);
+        }
+
         // Course code.
         $form->addText('wanted_code', get_lang('Code'), false, array('size' => '$maxlength', 'maxlength' => $maxlength));
         $form->applyFilter('wanted_code', 'html_filter');

main/session/session_list.php

@@ -37,15 +37,7 @@ if ($action == 'delete') {
 $tool_name = get_lang('SessionList');
 Display::display_header($tool_name);
 
-$url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=search_course';
-
-$courseList = array();
 $courseId = isset($_GET['course_id']) ? $_GET['course_id'] : null;
-if (!empty($courseId)) {
-    $courseInfo = api_get_course_info_by_id($courseId);
-    $parents = getParentsToString($courseInfo['categoryCode']);
-    $courseList[$courseInfo['code']] = $parents . $courseInfo['title'];
-}
 
 $sessionFilter = new FormValidator(
     'course_filter',
@@ -55,20 +47,32 @@ $sessionFilter = new FormValidator(
     array(),
     FormValidator::LAYOUT_INLINE
 );
-$sessionFilter->addElement(
+$courseSelect = $sessionFilter->addElement(
     'select_ajax',
     'course_name',
     get_lang('SearchCourse'),
     null,
-    array('url' => $url, 'defaults' => $courseList)
+    array('url' => api_get_path(WEB_AJAX_PATH) . 'course.ajax.php?a=search_course')
 );
 
+if (!empty($courseId)) {
+    $courseInfo = api_get_course_info_by_id($courseId);
+    $parents = getParentsToString($courseInfo['categoryCode']);
+
+    $courseSelect->addOption($parents . $courseInfo['title'], $courseInfo['code'], ['selected' => 'selected']);
+}
+
 $url = api_get_self();
 $actions = '
 <script>
 $(function() {
     $("#course_name").on("change", function() {
        var courseId = $(this).val();
+
+       if (!courseId) {
+        return;
+       }
+
        window.location = "'.$url.'?course_id="+courseId;
     });
 });