fix semester parameter for StudipSemSearch, fixes #4928

Closes #4928

Merge request studip/studip!3699

app/views/admin/autoinsert/_search.php

@@ -11,11 +11,8 @@
     <label>
         <?= _('Semester') ?>
         <?= Semester::getSemesterSelector(
-            ['name' => 'sem_select', 'id' => 'sem_select', 'class' => 'user_form'],
-            $sem_select, 'semester_id',
-            true,
-            false
-        )?>
+            ['name' => 'sem_select', 'id' => 'sem_select', 'class' => 'user_form']
+        ) ?>
     </label>
     <label>
         <?= _('Veranstaltung') ?>

lib/classes/JsonApi/Routes/Courses/CoursesIndex.php

@@ -79,10 +79,6 @@ class CoursesIndex extends JsonApiController
             if (!$semester) {
                 return 'Invalid "semester".';
             }
-            $semNumber = \Semester::getIndexById($semester->id, true, true);
-            if ($semNumber === false) {
-                return 'Invalid "semester".';
-            }
         }
     }
 
@@ -100,10 +96,6 @@ class CoursesIndex extends JsonApiController
 
         $filtering = $this->getQueryParameters()->getFilteringParameters() ?: [];
 
-        if (isset($filtering['semester'])) {
-            $filtering['semester'] = \Semester::getIndexById($filtering['semester'], true, true);
-        }
-
         return array_merge($defaults, $filtering);
     }
 

lib/models/Semester.php

@@ -259,15 +259,13 @@ class Semester extends SimpleORMap
      * @param integer $default
      * @param string $option_value
      * @param boolean $include_all
-     * @param boolean $use_semester_id
      * @return string
      */
     public static function getSemesterSelector(
         $select_attributes = null,
         $default = 0,
         $option_value = 'semester_id',
-        $include_all = true,
-        $use_semester_id = true
+        $include_all = true
     )
     {
         $select_attributes = array_merge([
@@ -291,7 +289,6 @@ class Semester extends SimpleORMap
         $template->select_attributes = $select_attributes;
         $template->default = $default;
         $template->option_value = $option_value;
-        $template->use_semester_id = $use_semester_id;
         return $template->render();
     }
 

templates/shared/semester-selector.php

@@ -5,7 +5,7 @@
 <select <?= $attributes ?>>
     <? foreach ($semesters as $sem_key => $one_sem) : ?>
         <? $one_sem['key'] = $sem_key; ?>
-        <option value="<?= $use_semester_id ? $one_sem[$option_value] : $sem_key ?>" <?= ($one_sem[$option_value] == $default ? "selected" : "") ?>>
+        <option value="<?= $one_sem[$option_value] ?>" <?= ($one_sem[$option_value] == $default ? "selected" : "") ?>>
             <?= htmlReady($one_sem['name']) ?>
         </option>
     <? endforeach ?>