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

Merge branch 'fix-notif-bug'

parents 4429840e 9e02fe03
Loading
Loading
Loading
Loading
Loading
+1 −1
Changes for module/Application/src/Application/Notification/ResultatTheseAdmisNotification.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ class ResultatTheseAdmisNotification extends Notification
{
    use TheseAwareTrait;

    protected $templatePath = 'application/these/mail/notif-resultat-these-modifie';
    protected $templatePath = 'application/import/mail/notif-resultat-admis-doctorant';

    /**
     * @return static
+1 −1
Changes for module/Application/src/Application/Notification/ResultatTheseModifieNotification.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ class ResultatTheseModifieNotification extends Notification
{
    use TheseAwareTrait;

    protected $templatePath = 'application/these/mail/notif-resultat-these-modifie';
    protected $templatePath = 'application/import/mail/notif-evenement-import';

    /**
     * @return static
+7 −7
Changes for module/Application/src/Application/Service/Notification/NotificationFactoryFactory.php: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -6,9 +6,10 @@ use Application\Service\EcoleDoctorale\EcoleDoctoraleService;
use Application\Service\UniteRecherche\UniteRechercheService;
use Application\Service\Variable\VariableService;
use UnicaenApp\Options\ModuleOptions;
use Zend\Mvc\Router\RouteStackInterface;
use Zend\Mvc\View\Console\ViewManager as ConsoleViewManager;
use Zend\Mvc\View\Http\ViewManager as HttpViewManager;
use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\View\Helper\Url;
use Zend\View\Helper\Url as UrlHelper;

/**
 * @author Unicaen
@@ -40,11 +41,10 @@ class NotificationFactoryFactory extends \Notification\Service\NotificationFacto
        $ecoleDoctoraleService = $serviceLocator->get('EcoleDoctoraleService');
        $uniteRechercheService = $serviceLocator->get('UniteRechercheService');

        /** @var RouteStackInterface $router */
        $router = $serviceLocator->get('router');
        /* @var Url $urlHelper */
        $urlHelper = $serviceLocator->get('ViewHelperManager')->get('Url');
        $urlHelper->setRouter($router);
        /** @var HttpViewManager|ConsoleViewManager $vm */
        $vm = $serviceLocator->get('ViewManager');
        /** @var UrlHelper $urlHelper */
        $urlHelper = $vm->getHelperManager()->get('Url');

        /* @var ModuleOptions $moduleOptions */
        $moduleOptions = $serviceLocator->get('unicaen-app_module_options');
+6 −7
Changes for module/Application/src/Application/Service/Notification/NotifierServiceFactory.php: 6 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ use Application\Service\Individu\IndividuService;
use Application\Service\Role\RoleService;
use Application\Service\UniteRecherche\UniteRechercheService;
use Application\Service\Variable\VariableService;
use Zend\Mvc\Router\RouteStackInterface;
use Zend\Mvc\View\Http\ViewManager as HttpViewManager;
use Zend\Mvc\View\Console\ViewManager as ConsoleViewManager;
use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\View\Helper\Url as UrlHelper;

@@ -42,12 +43,10 @@ class NotifierServiceFactory extends \Notification\Service\NotifierServiceFactor
        $individuService = $serviceLocator->get('IndividuService');
        $roleService = $serviceLocator->get('RoleService');

        /** @var RouteStackInterface $router */
        $router = $serviceLocator->get('router');
        $viewHelperManager = $serviceLocator->get('ViewHelperManager');
        /* @var UrlHelper $urlHelper */
        $urlHelper = $viewHelperManager->get('Url');
        $urlHelper->setRouter($router);
        /** @var HttpViewManager|ConsoleViewManager $vm */
        $vm = $serviceLocator->get('ViewManager');
        /** @var UrlHelper $urlHelper */
        $urlHelper = $vm->getHelperManager()->get('Url');

        /** @var NotificationFactory $notificationFactory */
        $notificationFactory = $serviceLocator->get(NotificationFactory::class);
+0 −1
Changes for module/Application/view/application/notification/mail/notif-validation-depot-these-corrigee.phtml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ use Application\Entity\Db\These;

/**
 * @var These  $these
 * @var string $url
 * @var string $message
 */
?>
Loading