chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5965 from christianbeeznest/rna-22246

Browse Source 
Internal: Fix course template selection and error handling in settings management - refs BT#22246
pull/5974/head
Nicolas Ducoulombier 9 months ago committed by GitHub
parent ac17881087 9be2926c38
commit 4be43e59ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 59 additions and 107 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 11
      src/CoreBundle/Controller/Admin/SettingsController.php
  2. 27
      src/CoreBundle/Form/DataTransformer/ResourceToIdentifierTransformer.php
  3. 10
      src/CoreBundle/Settings/CourseSettingsSchema.php
  4. 118
      src/CoreBundle/Settings/SettingsManager.php

11
src/CoreBundle/Controller/Admin/SettingsController.php
Unescape View File

@ -152,15 +152,20 @@ class SettingsController extends BaseController
$manager->save($form->getData());
$message = $this->trans('Settings have been successfully updated');
} catch (ValidatorException $validatorException) {
// $message = $this->trans($exception->getMessage(), [], 'validators');
$message = $this->trans($validatorException->getMessage());
$messageType = 'error';
}
$this->addFlash($messageType, $message);
if (!empty($keywordFromGet)) {
return $this->redirect($request->headers->get('referer'));
if (!empty($keyword)) {
return $this->redirectToRoute('chamilo_platform_settings_search', [
'keyword' => $keyword,
]);
}
return $this->redirectToRoute('chamilo_platform_settings', [
'namespace' => $namespace,
]);
}
$schemas = $manager->getSchemas();

27
src/CoreBundle/Form/DataTransformer/ResourceToIdentifierTransformer.php
Unescape View File

@ -31,23 +31,34 @@ final class ResourceToIdentifierTransformer implements DataTransformerInterface
return null;
}
/* @psalm-suppress ArgumentTypeCoercion */
Assert::isInstanceOf($value, $this->repository->getClassName());
if (is_object($value) && method_exists($value, 'getId')) {
return $value;
}
if (is_numeric($value)) {
return $this->repository->find($value);
}
return PropertyAccess::createPropertyAccessor()->getValue($value, $this->identifier);
return $value;
}
public function reverseTransform($value)
{
if (null === $value) {
if (null === $value || '' === $value) {
return null;
}
$resource = $this->repository->findOneBy([
$this->identifier => $value,
]);
if (is_object($value) && method_exists($value, 'getId')) {
return $value;
}
$resource = $this->repository->find($value);
if (null === $resource) {
throw new TransformationFailedException(\sprintf('Object "%s" with identifier "%s"="%s" does not exist.', $this->repository->getClassName(), $this->identifier, $value));
throw new TransformationFailedException(sprintf(
'Object "%s" with identifier "%s" does not exist.',
$this->repository->getClassName(),
$value
));
}
return $resource;

10
src/CoreBundle/Settings/CourseSettingsSchema.php
Unescape View File

@ -130,10 +130,10 @@ class CourseSettingsSchema extends AbstractSettingsSchema
'course_hide_tools',
new ArrayToIdentifierTransformer()
)
/* ->setTransformer(
->setTransformer(
'course_creation_use_template',
new ResourceToIdentifierTransformer($this->getRepository())
)*/
new ResourceToIdentifierTransformer($this->getRepository(), 'id')
)
;
$allowedTypes = [
@ -229,7 +229,9 @@ class CourseSettingsSchema extends AbstractSettingsSchema
'class' => Course::class,
'placeholder' => 'Choose ...',
'empty_data' => null,
'data' => null,
'choice_label' => 'title',
'choice_value' => 'id',
'required' => false,
]
)
->add('hide_scorm_export_link', YesNoType::class)

118
src/CoreBundle/Settings/SettingsManager.php
Unescape View File

@ -259,13 +259,7 @@ class SettingsManager implements SettingsManagerInterface
foreach ($settingsBuilder->getTransformers() as $parameter => $transformer) {
if (\array_key_exists($parameter, $parameters)) {
if ('course_creation_use_template' === $parameter) {
if (empty($parameters[$parameter])) {
$parameters[$parameter] = null;
}
} else {
$parameters[$parameter] = $transformer->reverseTransform($parameters[$parameter]);
}
$parameters[$parameter] = $transformer->reverseTransform($parameters[$parameter]);
}
}
@ -290,10 +284,8 @@ class SettingsManager implements SettingsManagerInterface
// 2. Is defined as an array in class DocumentSettingsSchema
// 3. Add transformer for that variable "ArrayToIdentifierTransformer"
// 4. Here we recover the transformer and convert the array to string
foreach ($settingsBuilder->getTransformers() as $parameter => $transformer) {
if (\array_key_exists($parameter, $parameters)) {
$parameters[$parameter] = $transformer->transform($parameters[$parameter]);
}
foreach ($parameters as $parameter => $value) {
$parameters[$parameter] = $this->transformToString($value);
}
$settings->setParameters($parameters);
@ -329,11 +321,6 @@ class SettingsManager implements SettingsManagerInterface
->setAccessUrlLocked(1)
;
// @var ConstraintViolationListInterface $errors
/*$errors = $this->validator->validate($parameter);
if (0 < $errors->count()) {
throw new ValidatorException($errors->get(0)->getMessage());
}*/
$this->manager->persist($parameter);
}
}
@ -359,10 +346,8 @@ class SettingsManager implements SettingsManagerInterface
// 2. Is defined as an array in class DocumentSettingsSchema
// 3. Add transformer for that variable "ArrayToIdentifierTransformer"
// 4. Here we recover the transformer and convert the array to string
foreach ($settingsBuilder->getTransformers() as $parameter => $transformer) {
if (\array_key_exists($parameter, $parameters)) {
$parameters[$parameter] = $transformer->transform($parameters[$parameter]);
}
foreach ($parameters as $parameter => $value) {
$parameters[$parameter] = $this->transformToString($value);
}
$settings->setParameters($parameters);
$persistedParameters = $this->repository->findBy([
@ -373,12 +358,6 @@ class SettingsManager implements SettingsManagerInterface
$persistedParametersMap[$parameter->getVariable()] = $parameter;
}
// @var SettingsEvent $event
/*$event = $this->eventDispatcher->dispatch(
SettingsEvent::PRE_SAVE,
new SettingsEvent($settings, $parameters)
);*/
$url = $this->getUrl();
$simpleCategoryName = str_replace('chamilo_core.settings.', '', $namespace);
@ -397,77 +376,11 @@ class SettingsManager implements SettingsManagerInterface
->setAccessUrlLocked(1)
;
// @var ConstraintViolationListInterface $errors
/*$errors = $this->validator->validate($parameter);
if (0 < $errors->count()) {
throw new ValidatorException($errors->get(0)->getMessage());
}*/
$this->manager->persist($parameter);
}
$this->manager->persist($parameter);
}
$this->manager->flush();
// $schemaAlias = $settings->getSchemaAlias();
// $schemaAliasChamilo = str_replace('chamilo_core.settings.', '', $schemaAlias);
//
// $schema = $this->schemaRegistry->get($schemaAlias);
//
// $settingsBuilder = new SettingsBuilder();
// $schema->buildSettings($settingsBuilder);
//
// $parameters = $settingsBuilder->resolve($settings->getParameters());
//
// foreach ($settingsBuilder->getTransformers() as $parameter => $transformer) {
// if (array_key_exists($parameter, $parameters)) {
// $parameters[$parameter] = $transformer->transform($parameters[$parameter]);
// }
// }
//
// /** @var \Sylius\Bundle\SettingsBundle\Event\SettingsEvent $event */
// $event = $this->eventDispatcher->dispatch(
// SettingsEvent::PRE_SAVE,
// new SettingsEvent($settings)
// );
//
// /** @var SettingsCurrent $url */
// $url = $event->getSettings()->getAccessUrl();
//
// foreach ($parameters as $name => $value) {
// if (isset($persistedParametersMap[$name])) {
// if ($value instanceof Course) {
// $value = $value->getId();
// }
// $persistedParametersMap[$name]->setValue($value);
// } else {
// $setting = new Settings();
// $setting->setSchemaAlias($schemaAlias);
//
// $setting
// ->setNamespace($schemaAliasChamilo)
// ->setName($name)
// ->setValue($value)
// ->setUrl($url)
// ->setAccessUrlLocked(0)
// ->setAccessUrlChangeable(1)
// ;
//
// /** @var ConstraintViolationListInterface $errors */
// /*$errors = $this->->validate($parameter);
// if (0 < $errors->count()) {
// throw new ValidatorException($errors->get(0)->getMessage());
// }*/
// $this->manager->persist($setting);
// $this->manager->flush();
// }
// }
/*$parameters = $settingsBuilder->resolve($settings->getParameters());
* $settings->setParameters($parameters);
* $this->eventDispatcher->dispatch(SettingsEvent::PRE_SAVE, new SettingsEvent($settings));
* $this->manager->persist($settings);
* $this->manager->flush();
* $this->eventDispatcher->dispatch(SettingsEvent::POST_SAVE, new SettingsEvent($settings));*/
}
/**
@ -1078,4 +991,25 @@ class SettingsManager implements SettingsManagerInterface
return $settings[$variable] ?? $defaultCategory;
}
private function transformToString($value): string
{
if (is_array($value)) {
return implode(',', $value);
}
if ($value instanceof Course) {
return (string) $value->getId();
}
if (is_bool($value)) {
return $value ? 'true' : 'false';
}
if (is_null($value)) {
return '';
}
return (string) $value;
}
}

Write Preview
Loading…
Cancel
Save