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

Fix settings configuration

Browse Source
pull/2487/head
jmontoyaa 7 years ago
parent 2bece1a319
commit f5286b04d5
3 changed files with 20 additions and 21 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. 2
      src/CoreBundle/Entity/Manager/SettingsCurrentManager.php
  2. 23
      src/SettingsBundle/Manager/SettingsManager.php
  3. 16
      src/SettingsBundle/Resources/config/services.xml

2
src/CoreBundle/Entity/Manager/SettingsCurrentManager.php
Unescape View File

@ -3,6 +3,8 @@
namespace Chamilo\CoreBundle\Entity\Manager;
use Doctrine\Common\Persistence\ObjectManager;
use Doctrine\ORM\EntityManager;
use Sonata\CoreBundle\Model\BaseEntityManager;
/**

23
src/SettingsBundle/Manager/SettingsManager.php
Unescape View File

@ -6,9 +6,9 @@ namespace Chamilo\SettingsBundle\Manager;
use Chamilo\CoreBundle\Entity\AccessUrl;
use Chamilo\CoreBundle\Entity\Course;
use Chamilo\CoreBundle\Settings\PlatformSettingsSchema;
use Doctrine\ORM\EntityRepository;
use Sylius\Bundle\ResourceBundle\Controller\EventDispatcherInterface;
use Sylius\Bundle\SettingsBundle\Event\SettingsEvent;
use Doctrine\Common\Cache\Cache;
use Doctrine\Common\Persistence\ObjectManager;
use Sylius\Bundle\SettingsBundle\Manager\SettingsManagerInterface;
use Sylius\Bundle\SettingsBundle\Model\Settings;
@ -19,10 +19,8 @@ use Sylius\Bundle\SettingsBundle\Schema\SchemaRegistryInterface;
use Sylius\Bundle\SettingsBundle\Schema\SettingsBuilder;
use Sylius\Component\Registry\ServiceRegistryInterface;
use Sylius\Component\Resource\Factory\FactoryInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
use Symfony\Component\Validator\ConstraintViolationListInterface;
use Symfony\Component\Validator\Exception\ValidatorException;
use Symfony\Component\Validator\ValidatorInterface;
use Sylius\Bundle\SettingsBundle\Manager\SettingsManager as SyliusSettingsManager;
use Chamilo\CoreBundle\Entity\SettingsCurrent;
@ -45,7 +43,7 @@ class SettingsManager implements SettingsManagerInterface
protected $resolverRegistry;
/**
* @var ObjectManager
* @var EntityRepository
*/
protected $manager;
@ -70,14 +68,14 @@ class SettingsManager implements SettingsManagerInterface
* SettingsManager constructor.
* @param ServiceRegistryInterface $schemaRegistry
* @param ServiceRegistryInterface $resolverRegistry
* @param ObjectManager $manager
* @param EntityRepository $manager
* @param FactoryInterface $settingsFactory
* @param $eventDispatcher
*/
public function __construct(
ServiceRegistryInterface $schemaRegistry,
ServiceRegistryInterface $resolverRegistry,
ObjectManager $manager,
$manager,
FactoryInterface $settingsFactory,
$eventDispatcher
) {
@ -681,12 +679,12 @@ class SettingsManager implements SettingsManagerInterface
$resolver = $this->resolverRegistry->get($schemaAlias);
// try to resolve settings for schema alias and namespace
$settings = $resolver->resolve($schemaAlias, $namespace);
//$settings = $resolver->resolve($schemaAlias, $namespace);
if (!$settings) {
//if (!$settings) {
$settings = $this->settingsFactory->createNew();
$settings->setSchemaAlias($schemaAlias);
}
//}
// We need to get a plain parameters array since we use the options resolver on it
$parameters = $this->getParameters($schemaAliasNoPrefix);
@ -745,7 +743,7 @@ class SettingsManager implements SettingsManagerInterface
$this->resolvedSettings[$namespace]->setParameters($transformedParameters);
}*/
$repo = $this->manager->getRepository('ChamiloCoreBundle:SettingsCurrent');
$repo = $this->manager;
$persistedParameters = $repo->findBy(['category' => $settings->getSchemaAlias()]);
$persistedParametersMap = array();
@ -786,7 +784,6 @@ var_dump($name, $value);
if (0 < $errors->count()) {
throw new ValidatorException($errors->get(0)->getMessage());
}*/
$this->manager->persist($parameter);
}
}
@ -871,11 +868,9 @@ var_dump($name, $value);
*/
private function getParameters($namespace)
{
//$repo = $this->parameterRepository;
$repo = $this->manager->getRepository('ChamiloCoreBundle:SettingsCurrent');
$parameters = [];
/** @var SettingsCurrent $parameter */
foreach ($repo->findBy(array('category' => $namespace)) as $parameter) {
foreach ($this->manager->findBy(array('category' => $namespace)) as $parameter) {
$parameters[$parameter->getTitle()] = $parameter->getSelectedValue();
}

16
src/SettingsBundle/Resources/config/services.xml
Unescape View File

@ -1,8 +1,8 @@
<?xml version="1.0" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters>
<parameter key="chamilo_settings.settings.manager.class">Chamilo\SettingsBundle\Manager\SettingsManager</parameter>
@ -13,15 +13,17 @@
</parameters>
<services>
<!--<service id="chamilo_settings.repository.parameter" class="%chamilo_settings.repository.parameter.class%">-->
<!--<factory service="doctrine.orm.entity_manager" method="getRepository" />-->
<!--<argument>%chamilo_settings.repository.parameter.entity.class%</argument>-->
<!--</service>-->
<service id="chamilo_settings.repository" class="Doctrine\ORM\EntityRepository">
<factory service="doctrine.orm.entity_manager" method="getRepository" />
<argument>%chamilo_settings.repository.parameter.entity.class%</argument>
</service>
<service id="chamilo.settings.manager" class="%chamilo_settings.settings.manager.class%">
<argument type="service" id="sylius.registry.settings_schema" />
<argument type="service" id="sylius.registry.settings_resolver" />
<argument type="service" id="sylius.manager.settings" />
<argument type="service" id="chamilo_settings.repository" />
<!--<argument type="service" id="sylius.manager.settings" />-->
<argument type="service" id="sylius.factory.settings" />
<argument type="service" id="event_dispatcher" />
</service>

Write Preview
Loading…
Cancel
Save