simplification acl

Etienne Pallier
1 parent 9138c855
Showing 2 changed files with 8 additions and 2 deletions Show diff stats
src/Template/Materiels/edit.ctp
src/Template/Materiels/view.ctp
@@ -340,9 +340,12 @@ if ($IS_VALIDATED &amp;&amp; $materiel-&gt;numero_serie)
             'options' => $fournisseurs,
             'style' => 'width: 380px',
             'empty' => 'choisir un fournisseur',
-            'disabled' => in_array($role, [
+            'disabled' => $USER_IS_UTILISATEUR
+            /*
+            in_array($role, [
                 'Utilisateur'
             ])
+            */
         ]);
         echo $this->Form->control('organisme_id', [
             'options' => $organismes,
@@ -485,11 +485,14 @@ $panne = h($materiel-&gt;hors_service) ? &#39; (HORS SERVICE)&#39; : &#39;&#39;;
         ]);
  
     // BOUTON ETIQUETTE (si imprimante disponible)
-    if ($IS_VALIDATED && $configuration->hasPrinter && in_array($role, [
+    if ($IS_VALIDATED && $configuration->hasPrinter && $USER_IS_ADMIN_OR_MORE) {
+    /*
+    in_array($role, [
         'Administration',
         'Administration Plus',
         'Super Administrateur'
     ])) {
+    */
         // echo "<br/>";
         // echo '<div id="etiquette" class="actions" style="margin-bottom: 20px; width: 100%; float: none; padding: 10px 0;">';
         // - Bouton "Imprimer sur un ruban"