Commit a5b8a0b9 authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branches 'Modulateurs-Statuts' and 'v8' of...

Merge branches 'Modulateurs-Statuts' and 'v8' of https://git.unicaen.fr/open-source/OSE into Modulateurs-Statuts

# Conflicts:
#	module/Application/src/Application/Controller/ModulateurController.php
#	module/Application/view/application/modulateur/index.phtml
parent 6f61fa4a
......@@ -54,7 +54,7 @@ return [
'administration' => [
'pages' => [
'motif-modification-service' => [
'label' => 'Motif de Modification du Service Dû',
'label' => 'Motif de modification du service dû',
'icon' => 'fa fa-graduation-cap',
'route' => 'motif-modification-service',
'resource' => PrivilegeController::getResourceId('Application\Controller\MotifModificationService', 'index'),
......
......@@ -60,9 +60,9 @@ $canEdit = $this->isAllowed(Privileges::getResourceId(Privileges::MOTIFS_MODIFIC
<?php if ($canEdit): ?>
<a class="btn btn-primary ajax-modal" data-event="motif-modification-service-saisie"
href="<?= $this->url('motif-modification-service/saisie') ?>"
title="Ajouter une MOTIF_MODIFICATION_SERVICE">
title="Ajouter un motif de modification du service dû">
<span class="glyphicon glyphicon-edit"></span>
Ajouter une MOTIF_MODIFICATION_SERVICE</a>
Ajouter un motif de modification du service dû</a>
<script type="text/javascript">
$(function () {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment