Skills: Fix checkbox defaults BT#13334

main/admin/course_edit.php

@@ -330,8 +330,7 @@ if (api_get_configuration_value('multiple_access_url_show_shared_course_marker')
 }
 $allowSkillRelItem = api_get_configuration_value('allow_skill_rel_items');
 if ($allowSkillRelItem) {
-    $selectedSkills = Skill::setSkillsToCourse($form, $courseId);
+    Skill::setSkillsToCourse($form, $courseId);
-    $courseInfo['skills'] = array_keys($selectedSkills);
 }
 
 $htmlHeadXtra[] = '

main/admin/skill_rel_course.php

@@ -33,14 +33,10 @@ if (!empty($sessionId)) {
 }
 
 $form->addHeader(get_lang('AddSkills').$sessionName);
-
+Skill::setSkillsToCourse($form, $courseId, $sessionId);
-$selectedSkills = Skill::setSkillsToCourse($form, $courseId, $sessionId);
-$courseInfo['skills'] = array_keys($selectedSkills);
 
 $form->addButtonSave(get_lang('Save'));
 
-$form->setDefaults(['skills' => array_keys($selectedSkills)]);
-
 if ($form->validate()) {
     $result = Skill::saveSkillsToCourseFromForm($form);
     if ($result) {

main/inc/lib/skill.lib.php

@@ -2887,7 +2887,7 @@ class Skill extends Model
         $selectedSkills = [];
         /** @var \Chamilo\SkillBundle\Entity\SkillRelCourse $skillRelCourse */
         foreach ($items as $skillRelCourse) {
-            $selectedSkills[$skillRelCourse->getSkill()->getId()] = $skillRelCourse->getSkill()->getName();
+            $selectedSkills[] = $skillRelCourse->getSkill()->getId();
         }
 
         if (!empty($skillList)) {
@@ -2896,12 +2896,18 @@ class Skill extends Model
 
         $elements = [];
         foreach ($skillList as $skillId => $skill) {
-            $elements[] = $form->createElement(
+            $element = $form->createElement(
                 'checkbox',
                 "skills[$skillId]",
                 null,
                 $skill
             );
+
+            if (in_array($skillId, $selectedSkills)) {
+                $element->setValue(1);
+            }
+
+            $elements[] = $element;
         }
         $form->addGroup($elements, '', get_lang('Skills'));
 
@@ -2947,6 +2953,7 @@ class Skill extends Model
         if (empty($course)) {
             return false;
         }
+
         $session = null;
         if (!empty($sessionId)) {
             $session = api_get_session_entity($sessionId);
@@ -2974,9 +2981,10 @@ class Skill extends Model
         // Add new one
         if (!empty($skills)) {
             foreach ($skills as $skillId) {
-                $item = new SkillRelCourse();
+                $item = (new SkillRelCourse())
-                $item->setCourse($course);
+                    ->setCourse($course)
-                $item->setSession($session);
+                    ->setSession($session)
+                ;
 
                 /** @var SkillEntity $skill */
                 $skill = $em->getRepository('ChamiloCoreBundle:Skill')->find($skillId);