Merge pull request #6504 from christianbeeznest/rna-22255

Course: Fix catalogue shows private courses and fallback radios - refs BT#22255

Author: christianbeeznest

public/main/inc/lib/extra_field.lib.php

@@ -1194,9 +1194,7 @@ public function set_extra_fields_in_form(
                         break;
                     case self::FIELD_TYPE_RADIO:
                         $group = [];
-                        if (isset($field_details['options']) &&
-                            !empty($field_details['options'])
-                        ) {
+                        if (isset($field_details['options']) && !empty($field_details['options'])) {
                             foreach ($field_details['options'] as $option_details) {
                                 $options[$option_details['option_value']] = $option_details['display_text'];
                                 $group[] = $form->createElement(
@@ -1207,6 +1205,33 @@ public function set_extra_fields_in_form(
                                     $option_details['option_value']
                                 );
                             }
+                        } else {
+                            // Fallback: Yes/No
+                            $currentValue = $extraData["extra_$variable"] ?? null;
+
+                            $group[] = $form->createElement(
+                                'radio',
+                                'extra_'.$variable,
+                                '1',
+                                get_lang('Yes').'<br />',
+                                '1'
+                            );
+                            $group[] = $form->createElement(
+                                'radio',
+                                'extra_'.$variable,
+                                '0',
+                                get_lang('No').'<br />',
+                                '0'
+                            );
+
+                            // Select default if nothing set
+                            if (!isset($currentValue)) {
+                                if (!empty($field_details['default_value'])) {
+                                    $form->setDefaults(['extra_'.$variable => $field_details['default_value']]);
+                                } else {
+                                    $form->setDefaults(['extra_'.$variable => '0']);
+                                }
+                            }
                         }
                         $form->addGroup(
                             $group,

src/CoreBundle/State/PublicCatalogueCourseStateProvider.php

@@ -53,6 +53,10 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
         }
 
         $host = $request->getSchemeAndHttpHost().'/';
+        $hidePrivateCourses = 'true' === $this->settingsManager->getSetting('platform.course_catalog_hide_private', true);
+        $visibilities = $hidePrivateCourses
+            ? [Course::OPEN_WORLD, Course::OPEN_PLATFORM]
+            : [Course::OPEN_WORLD, Course::OPEN_PLATFORM, Course::REGISTERED];
 
         /** @var AccessUrl $accessUrl */
         $accessUrl = $this->accessUrlRepository->findOneBy(['url' => $host]) ?? $this->accessUrlRepository->find(1);
@@ -61,7 +65,7 @@ public function provide(Operation $operation, array $uriVariables = [], array $c
             ->andWhere('url_rel.url = :accessUrl')
             ->andWhere('c.visibility IN (:visibilities)')
             ->setParameter('accessUrl', $accessUrl->getId())
-            ->setParameter('visibilities', [Course::OPEN_WORLD, Course::OPEN_PLATFORM])
+            ->setParameter('visibilities', $visibilities)
             ->orderBy('c.title', 'ASC')
             ->getQuery()
             ->getResult()