From ce23c2a88037167f46644bb2d323535f65215848 Mon Sep 17 00:00:00 2001
From: Thibaud Ajas <thibaud.ajas@irap.omp.eu>
Date: Wed, 14 Jun 2017 10:09:33 +0200
Subject: [PATCH] correction bug materiel/add -> désignation obligatoire sans vraiment l'être

---
 src/Template/Materiels/add.ctp  | 16 +++++++++++-----
 src/Template/Materiels/edit.ctp | 18 ++++--------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/Template/Materiels/add.ctp b/src/Template/Materiels/add.ctp
index 6ffd90c..dce35a8 100755
--- a/src/Template/Materiels/add.ctp
+++ b/src/Template/Materiels/add.ctp
@@ -44,11 +44,17 @@ if (isset($cpMateriel)) {
         <?=$this->Form->submit(__('Enregistrer'))?>
 
         <?php
-        echo '<div class="input text required"><label for="designation">Désignation</label><input list="designa" id="designation" name="designation" type="text" placeholder="choisir/ajouter une designation" autocomplete="off"><datalist id="designa">';
-        foreach ($designation as $e) {
-            echo "<option value=\"$e\">";
-        }
-        echo '</datalist> </div>';
+//         echo '<div class="input text required"><label for="designation">Désignation</label><input list="designa" id="designation" name="designation" type="text" placeholder="choisir/ajouter une designation" autocomplete="off"><datalist id="designa">';
+//         foreach ($designation as $e) {
+//             echo "<option value=\"$e\">";
+//         }
+//         echo '</datalist> </div>';
+
+        echo $this->Form->input('designation', [
+        	'label' => 'Désignation',
+        	'default' => $Designation
+        ]);
+        
         echo $this->Form->input('sur_categorie_id', [
             'label' => 'Domaine',
             'style' => 'width: 260px',
diff --git a/src/Template/Materiels/edit.ctp b/src/Template/Materiels/edit.ctp
index 8fd3a62..3698641 100755
--- a/src/Template/Materiels/edit.ctp
+++ b/src/Template/Materiels/edit.ctp
@@ -3,20 +3,10 @@ use Cake\ORM\TableRegistry;
 
 $USER_IS_UTILISATEUR_AND_CREATOR_OR_OWNER = $USER_IS_UTILISATEUR && in_array($username, [$materiel->nom_createur, $materiel->nom_responsable]);
 
-$USER_IS_RESPONSABLE_AND_SAME_GROUP =
-	$USER_IS_RESPONSABLE
-	&&
-	(
-			(
-					isset($userConnected->groupes_metier_id)
-					&& $materiel->groupes_metier_id == $userConnected->groupes_metier_id
-			)
-			||
-			(
-					isset($userConnected->groupe_thematique_id)
-					&& $materiel->groupes_thematique_id == $userConnected->groupe_thematique_id
-			)
-	);
+$USER_IS_RESPONSABLE_AND_SAME_GROUP = $USER_IS_RESPONSABLE && ( 
+		( isset($userConnected->groupes_metier_id) && $materiel->groupes_metier_id == $userConnected->groupes_metier_id ) 
+		|| ( isset($userConnected->groupe_thematique_id) && $materiel->groupes_thematique_id == $userConnected->groupe_thematique_id )
+		);
 
 $administrationData = array(
     'eotp',
--
libgit2 0.21.2