Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

public/main/auth/courses.php

@@ -22,7 +22,8 @@
     api_block_anonymous_users();
 }
 
-$allowExtraFields = !empty(api_get_setting('catalog.course_catalog_settings'));
+$catalogSettings = api_get_setting('catalog.course_catalog_settings');
+$allowExtraFields = !empty($catalogSettings['extra_fields_in_search_form']);
 
 // For students
 $userCanViewPage = true;

src/CoreBundle/Controller/CatalogueController.php

@@ -179,7 +179,7 @@ public function listSessions(): JsonResponse
     #[Route('/course-extra-fields', name: 'chamilo_core_catalogue_course_extra_fields', methods: ['GET'])]
     public function getCourseExtraFields(SettingsManager $settingsManager): JsonResponse
     {
-        if (empty($settingsManager->getSetting('catalog.course_catalog_settings'))) {
+        if (empty($settingsManager->getSetting('catalog.course_catalog_settings')['extra_fields_in_search_form'])) {
             return $this->json([]);
         }
 

src/CoreBundle/DataFixtures/SettingsCurrentFixtures.php

@@ -1543,8 +1543,8 @@ public static function getNewConfigurationSettings(): array
                 ],
                 [
                     'name'    => 'only_show_course_from_selected_category',
-                    'title'   => 'Only Selected Category',
-                    'comment' => 'Show only courses from a specific selected category.',
+                    'title'   => 'Only show matching categories in courses catalogue',
+                    'comment' => 'When not empty, only the courses from the given categories will appear in the courses catalogue.',
                 ],
                 [
                     'name'    => 'allow_students_to_browse_courses',

src/CoreBundle/DataFixtures/SettingsValueTemplateFixtures.php

@@ -29,6 +29,10 @@ public static function getTemplatesGrouped(): array
     {
         return [
             'catalog' => [
+                [
+                    'variable' => 'only_show_course_from_selected_category',
+                    'json_example' => ['Cat1', 'Cat2'],
+                ],
                 [
                     'variable'     => 'course_catalog_settings',
                     'json_example' => [

src/CoreBundle/Migrations/Schema/V200/Version20250724180700.php

@@ -72,9 +72,9 @@ public function up(Schema $schema): void
             ],
             [
                 'variable'       => 'only_show_course_from_selected_category',
-                'selected_value' => 'false',
-                'title'          => 'Only Selected Category',
-                'comment'        => 'Show only courses from a specific selected category.',
+                'selected_value' => '',
+                'title'          => 'Only show matching categories in courses catalogue',
+                'comment'        => 'When not empty, only the courses from the given categories will appear in the courses catalogue.',
                 'category'       => 'catalog',
             ],
             [

src/CoreBundle/Settings/CatalogSettingsSchema.php

@@ -7,6 +7,7 @@
 namespace Chamilo\CoreBundle\Settings;
 
 use Chamilo\CoreBundle\Form\Type\YesNoType;
+use Sonata\AdminBundle\Form\Type\Filter\ChoiceType;
 use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -20,13 +21,13 @@ public function buildSettings(AbstractSettingsBuilder $builder): void
             'session_catalog_settings'   => '',
             'show_courses_descriptions_in_catalog'       => 'false',
             'course_catalog_published'                   => 'false',
-            'course_catalog_display_in_home'             => 'true',
+            'course_catalog_display_in_home'             => 'false',
             'hide_public_link'                           => 'false',
             'only_show_selected_courses'                 => 'false',
-            'only_show_course_from_selected_category'    => 'false',
+            'only_show_course_from_selected_category'    => '',
             'allow_students_to_browse_courses'           => 'true',
             'course_catalog_hide_private'                => 'true',
-            'show_courses_sessions'                      => 'true',
+            'show_courses_sessions'                      => '0',
             'allow_session_auto_subscription'            => 'false',
             'course_subscription_in_user_s_session'      => 'false',
         ]);
@@ -52,10 +53,23 @@ public function buildForm(FormBuilderInterface $builder): void
             ->add('course_catalog_display_in_home', YesNoType::class)
             ->add('hide_public_link', YesNoType::class)
             ->add('only_show_selected_courses', YesNoType::class)
-            ->add('only_show_course_from_selected_category', YesNoType::class)
+            ->add('only_show_course_from_selected_category', TextareaType::class, [
+                'attr' => ['rows' => 3, 'style' => 'font-family: monospace;'],
+            ])
             ->add('allow_students_to_browse_courses', YesNoType::class)
             ->add('course_catalog_hide_private', YesNoType::class)
-            ->add('show_courses_sessions', YesNoType::class)
+            ->add(
+                'show_courses_sessions',
+                   ChoiceType::class,
+                   [
+                           'choices' => [
+                                   'Hide catalogue'       => '-1',
+                                   'Show only courses'    => '0',
+                                   'Show only sessions'   => '1',
+                                   'Show courses & sessions' => '2',
+                               ],
+                       ],
+                    )
             ->add('allow_session_auto_subscription', YesNoType::class)
             ->add('course_subscription_in_user_s_session', YesNoType::class);
 

src/CoreBundle/State/PublicCatalogueCourseStateProvider.php

@@ -45,7 +45,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $onlyShowMatching = 'true' === $this->settingsManager->getSetting('catalog.only_show_selected_courses', true);
-        $onlyShowCoursesWithCategory = 'true' === $this->settingsManager->getSetting('catalog.only_show_course_from_selected_category', true);
+        $onlyShowCoursesWithCategory = $this->settingsManager->getSetting('catalog.only_show_course_from_selected_category', true);
 
         $request = $this->requestStack->getCurrentRequest();
         if (!$request) {