Commit e4168937 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

merging

parents 41d94fdf 7a981ba5
Loading
Loading
Loading
Loading
+7 −7
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@

namespace UnicaenMail;

use Zend\Mvc\ModuleRouteListener;
use Zend\Mvc\MvcEvent;
use Zend\Stdlib\ArrayUtils;
use Zend\Stdlib\Glob;
use Zend\Config\Factory as ConfigFactory;
use Laminas\Mvc\ModuleRouteListener;
use Laminas\Mvc\MvcEvent;
use Laminas\Stdlib\ArrayUtils;
use Laminas\Stdlib\Glob;
use Laminas\Config\Factory as ConfigFactory;

class Module
{
@@ -18,7 +18,7 @@ class Module
        $moduleRouteListener->attach($eventManager);

        /* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */
        $eventManager->getSharedManager()->attach('Zend\Mvc\Controller\AbstractActionController', 'dispatch',
        $eventManager->getSharedManager()->attach('Laminas\Mvc\Controller\AbstractActionController', 'dispatch',
            function (MvcEvent $e) {
                $request = $e->getRequest();
                if ($request instanceof HttpRequest && $request->isXmlHttpRequest()) {
@@ -46,7 +46,7 @@ class Module
    public function getAutoloaderConfig()
    {
        return array(
            'Zend\Loader\StandardAutoloader' => array(
            'Laminas\Loader\StandardAutoloader' => array(
                'namespaces' => array(
                    __NAMESPACE__ => __DIR__ . '/src/' . __NAMESPACE__,
                ),
+18 −18
Original line number Diff line number Diff line
@@ -8,12 +8,12 @@
        }
    ],
    "require": {
    "unicaen/app":                                  "^3.0",
    "unicaen/privilege":                            "dev-master"
        "unicaen/privilege": "^5.0",
        "laminas/laminas-dependency-plugin": "^2.2",
        "php": "^7.0"
    },
    "autoload": {
    "psr-0": {
    },
        "psr-0": [],
        "classmap": [
            "./Module.php"
        ]
+3 −21
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ use UnicaenMail\Service\Mail\MailServiceFactory;
use UnicaenMail\View\Helper\MailsViewHelper;
use UnicaenMail\View\Helper\MailViewHelper;
use UnicaenPrivilege\Guard\PrivilegeController;
use Zend\Router\Http\Literal;
use Zend\Router\Http\Segment;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;

return array(
    'bjyauthorize'    => [
@@ -64,25 +64,7 @@ return array(
        ],
    ],

    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'mail' => [
                                'label' => 'Mails',
                                'route' => 'mail',
                                'resource' => PrivilegeController::getResourceId(MailController::class, 'index'),
                                'order'    => 10400,
                                'icon' => 'fas fa-angle-right',
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],


    'router' => [
        'routes' => [
+6 −0
Original line number Diff line number Diff line
@@ -39,4 +39,10 @@ return [
        'factories' => [
        ],
    ],

    'public_files' => [
        'stylesheets' => [
            '11000_mail' => 'css/unicaen-mail.css',
        ],
    ],
];
 No newline at end of file
+26 −0
Original line number Diff line number Diff line
<?php

use UnicaenMail\Controller\MailController;
use UnicaenPrivilege\Guard\PrivilegeController;

return [
    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'mail' => [
                                'label' => 'Courriers électroniques',
                                'route' => 'mail',
                                'resource' => PrivilegeController::getResourceId(MailController::class, 'index'),
                                'order'    => 9003,
                                'icon' => 'fas fa-angle-right',
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],
];
 No newline at end of file
Loading