Skip to content

Commit 019eb1c

Browse files
committed
Merge branch 'master' of github.com:chamilo/chamilo-lms
2 parents 80cd5fa + 658b19a commit 019eb1c

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

src/CoreBundle/Settings/PlatformSettingsSchema.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ public function buildForm(FormBuilderInterface $builder): void
156156
->add('allow_my_files', YesNoType::class)
157157
// old settings with no category
158158
->add('chamilo_database_version')
159-
->add('registered', YesNoType::class)
160159
->add(
161160
'load_term_conditions_section',
162161
ChoiceType::class,
@@ -276,6 +275,16 @@ public function buildForm(FormBuilderInterface $builder): void
276275
$this->updateFormFieldsFromSettingsInfo($builder);
277276
}
278277

278+
/**
279+
* Returns the list of internal settings that should be hidden from forms and search.
280+
*/
281+
public function getHiddenSettings(): array
282+
{
283+
return [
284+
'registered',
285+
];
286+
}
287+
279288
private function settingArrayHelpValue(string $variable): string
280289
{
281290
$values = [

src/CoreBundle/Settings/SettingsManager.php

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,9 +401,25 @@ public function getParametersFromKeywordOrderedByCategory($keyword): array
401401
$parametersFromDb = $query->getQuery()->getResult();
402402
$parameters = [];
403403

404-
/** @var SettingsCurrent $parameter */
405404
foreach ($parametersFromDb as $parameter) {
406-
$parameters[$parameter->getCategory()][] = $parameter;
405+
/** @var SettingsCurrent $parameter */
406+
$category = $parameter->getCategory();
407+
$variable = $parameter->getVariable();
408+
409+
$hidden = [];
410+
$serviceKey = 'chamilo_core.settings.'.$category;
411+
if ($this->schemaRegistry->has($serviceKey)) {
412+
$schema = $this->schemaRegistry->get($serviceKey);
413+
if (method_exists($schema, 'getHiddenSettings')) {
414+
$hidden = $schema->getHiddenSettings();
415+
}
416+
}
417+
418+
if (in_array($variable, $hidden, true)) {
419+
continue;
420+
}
421+
422+
$parameters[$category][] = $parameter;
407423
}
408424

409425
return $parameters;

0 commit comments

Comments
 (0)