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

Merge branch 'release_5.2.7' of git.unicaen.fr:open-source/sygal into release_5.2.7

parents 0d8d0a01 ab096105

composer.json

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
        "ext-json": "*",

        "ext-libxml": "*",

        "ext-readline": "*",

        "ext-saxonc": "*",

        "ext-simplexml": "*",

        "ext-soap": "*",

        "ext-xmlwriter": "*",

composer.lock

+493 −471

File changed.

Preview size limit exceeded, changes collapsed.

module/Depot/config/others/depot.config.php

+21 −13
Original line number Diff line number Diff line
@@ -779,19 +779,6 @@ return [ 
                                        'etape' => null,

                                        'visible' => TheseAssertion::class,

                                    ],

                                    'depot-divers' => [

                                        'id' => 'depot-divers',

                                        'label' => 'Dépôt fichiers divers',

                                        'route' => 'these/depot-divers',

                                        'withtarget' => true,

                                        'paramsInject' => [

                                            'these',

                                        ],

                                        'icon' => 'fas fa-copy',

                                        'resource' => PrivilegeController::getResourceId(DepotController::class, 'detail-fichiers'),

                                        'etape' => WfEtape::CODE_DEPOT_VERSION_ORIGINALE,

                                        'visible' => TheseAssertion::class,

                                    ],

                                    'divider-these' => [

                                        'label' => null,

                                        'uri' => '',
@@ -949,6 +936,27 @@ return [ 
                                    ],

                                ]

                            ],

                            'divider-depot' => [

                                'label' => null,

                                'order' => 90,

                                'uri' => '',

                                'class' => 'divider',

                                'separator' => true,

                            ],

                            'depot-divers' => [

                                'id' => 'depot-divers',

                                'label' => 'Dépôt fichiers divers',

                                'order' => 100,

                                'route' => 'these/depot-divers',

                                'withtarget' => true,

                                'paramsInject' => [

                                    'these',

                                ],

                                'icon' => 'fas fa-copy',

                                'resource' => PrivilegeController::getResourceId(DepotController::class, 'detail-fichiers'),

                                'etape' => WfEtape::CODE_DEPOT_VERSION_ORIGINALE,

                                'visible' => TheseAssertion::class,

                            ],

                        ],

                    ],