Commit e55cd911 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Plus d'obligation d'activer le module unicaen/livelog

parent 649b9c35

src/UnicaenDbImport/Log/LivelogLoggerFactory.php

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
namespace UnicaenDbImport\Log;



use Monolog\Formatter\LineFormatter;

use Monolog\Handler\NoopHandler;

use Monolog\Logger;

use Psr\Container\ContainerInterface;

use UnicaenLivelog\Log\LivelogSocketLogHandler;
@@ -15,6 +16,11 @@ class LivelogLoggerFactory 
     */

    public function __invoke(ContainerInterface $container): Logger

    {

        // le module unicaen/livelog peut ne pas être activé, on retourne alors un Logger Noop

        if (!$container->has(LivelogSocketLogHandler::class)) {

            return new Logger('LivelogFakeLogger', [new NoopHandler()]);

        }



        /** @var LivelogSocketLogHandler $livelogSocketHandler */

        $livelogSocketHandler = $container->get(LivelogSocketLogHandler::class);

        $livelogSocketHandler->setFormatter(new LineFormatter(null, 'd/m/Y H:i:s'));

view/unicaen-db-import/import/index.phtml

+3 −0
Original line number Diff line number Diff line
@@ -141,10 +141,13 @@ $lancable = $this->isAllowed(ImportPrivilege::getResourceId(ImportPrivilege::LAN 
           ) ?>"><span class="fas fa-play"></span> Lancer les imports sélectionnés</a>



        <?php

        // le module unicaen/livelog peut ne pas être activé

        if ($this->getHelperPluginManager()->has('livelogPanel')) {

            /** @var \UnicaenLivelog\View\Helper\LivelogPanelHelper $livelogPanelHelper */

            $livelogPanelHelper = $this->plugin('livelogPanel');

            $livelogPanelHelper->setDivId($divId = 'livelog-div');

            echo $livelogPanelHelper;

        }

        ?>

    <?php endif ?>

view/unicaen-db-import/import/voir.phtml

+3 −0
Original line number Diff line number Diff line
@@ -58,10 +58,13 @@ $lancable = $this->isAllowed(ImportPrivilege::getResourceId(ImportPrivilege::LAN 
               ) ?>"><span class="fas fa-play"></span> Lancer l'import</a>



            <?php

            // le module unicaen/livelog peut ne pas être activé

            if ($this->getHelperPluginManager()->has('livelogPanel')) {

                /** @var \UnicaenLivelog\View\Helper\LivelogPanelHelper $livelogPanelHelper */

                $livelogPanelHelper = $this->plugin('livelogPanel');

                $livelogPanelHelper->setDivId($divId = 'livelog-div');

                echo $livelogPanelHelper;

            }

            ?>

        <?php endif ?>

    </div>

view/unicaen-db-import/synchro/index.phtml

+3 −0
Original line number Diff line number Diff line
@@ -167,10 +167,13 @@ $lancable = $this->isAllowed(SynchroPrivilege::getResourceId(SynchroPrivilege::L 
           ) ?>"><span class="fas fa-play"></span> Lancer les synchros sélectionnées</a>



        <?php

        // le module unicaen/livelog peut ne pas être activé

        if ($this->getHelperPluginManager()->has('livelogPanel')) {

            /** @var \UnicaenLivelog\View\Helper\LivelogPanelHelper $livelogPanelHelper */

            $livelogPanelHelper = $this->plugin('livelogPanel');

            $livelogPanelHelper->setDivId($divId = 'livelog-div');

            echo $livelogPanelHelper;

        }

        ?>

    <?php endif ?>

view/unicaen-db-import/synchro/voir.phtml

+3 −0
Original line number Diff line number Diff line
@@ -72,10 +72,13 @@ $lancable = $this->isAllowed(SynchroPrivilege::getResourceId(SynchroPrivilege::L 
               ) ?>"><span class="fas fa-play"></span> Lancer la synchro</a>



            <?php

            // le module unicaen/livelog peut ne pas être activé

            if ($this->getHelperPluginManager()->has('livelogPanel')) {

                /** @var \UnicaenLivelog\View\Helper\LivelogPanelHelper $livelogPanelHelper */

                $livelogPanelHelper = $this->plugin('livelogPanel');

                $livelogPanelHelper->setDivId($divId = 'livelog-div');

                echo $livelogPanelHelper;

            }

            ?>

        <?php endif ?>

    </div>