diff --git a/main/session/about.php b/main/session/about.php index 27dfe3bc6a..ced373e076 100644 --- a/main/session/about.php +++ b/main/session/about.php @@ -30,31 +30,18 @@ $fieldValuesRepo = $entityManager->getRepository('ChamiloCoreBundle:ExtraFieldVa $fieldTagsRepo = $entityManager->getRepository('ChamiloCoreBundle:ExtraFieldRelTag'); $userRepo = $entityManager->getRepository('ChamiloUserBundle:User'); -$videoUrlField = $fieldsRepo->findOneBy([ - 'extraFieldType' => ExtraField::COURSE_FIELD_TYPE, - 'variable' => 'video_url' -]); $tagField = $fieldsRepo->findOneBy([ 'extraFieldType' => ExtraField::COURSE_FIELD_TYPE, 'variable' => 'tags' ]); foreach ($sessionCourses as $sessionCourse) { - $courseVideo = null; - $courseTags = []; - - if (!is_null($videoUrlField)) { - $videoUrlValue = $fieldValuesRepo->findOneBy([ - 'field' => $videoUrlField, - 'itemId' => $sessionCourse->getId() - ]); + $courseFieldValues = $fieldValuesRepo->getVisibleValues( + Chamilo\CoreBundle\Entity\ExtraField::COURSE_FIELD_TYPE, + $sessionCourse->getId() + ); - if (!is_null($videoUrlValue)) { - $essence = \Essence\Essence::instance(); - - $courseVideo = $essence->replace($videoUrlValue->getValue()); - } - } + $courseTags = []; if (!is_null($tagField)) { $courseTags = $fieldTagsRepo->getTags($tagField, $sessionCourse->getId()); @@ -115,12 +102,12 @@ foreach ($sessionCourses as $sessionCourse) { $courses[] = [ 'course' => $sessionCourse, - 'video' => $courseVideo, 'description' => $courseDescription, 'tags' => $courseTags, 'objectives' => $courseObjectives, 'topics' => $courseTopics, - 'coaches' => $coachesData + 'coaches' => $coachesData, + 'extra_fields' => $courseFieldValues ]; } @@ -136,6 +123,7 @@ $template->assign( ) ); $template->assign('courses', $courses); +$template->assign('essence', \Essence\Essence::instance()); $templateFolder = api_get_configuration_value('default_template'); diff --git a/main/template/default/session/about.tpl b/main/template/default/session/about.tpl index c03aa453c5..360aafe8c7 100644 --- a/main/template/default/session/about.tpl +++ b/main/template/default/session/about.tpl @@ -6,6 +6,14 @@ {% endif %} {% for course_data in courses %} + {% set course_video = '' %} + + {% for extra_field in course_data.extra_fields %} + {% if extra_field.getField().getVariable() == 'video_url' %} + {% set course_video = extra_field.getValue() %} + {% endif %} + {% endfor %} + {% if courses|length > 1 %}