From 6e24801973e35ec44244174ea0f52db8ccef51c6 Mon Sep 17 00:00:00 2001
From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Mon, 21 Jan 2013 10:34:02 +0000
Subject: [PATCH] =?utf8?q?pour=20mettre=20en=20valeur=20le=20commentaire?=
 =?utf8?q?=20retourn=C3=A9=20par=20validation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 InterfaceQT4/politiquesValidation.py |  4 +-
 UiQT4/desPlusieursBase.ui            | 68 ++++++++++++++--------------
 2 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/InterfaceQT4/politiquesValidation.py b/InterfaceQT4/politiquesValidation.py
index 0d6474f6..04f852e7 100644
--- a/InterfaceQT4/politiquesValidation.py
+++ b/InterfaceQT4/politiquesValidation.py
@@ -174,7 +174,7 @@ class PolitiquePlusieurs(Validation):
              if not valide :
                 try :
                    valeur,valide=self.node.item.eval_valeur(valeur)
-                   valide,commentaire = self.node.item.object.verif_type(valeur)
+                   valide,commentaire2 = self.node.item.object.verif_type(valeur)
                 except :
                    #return testtype,commentaire,"",listeRetour
                    pass
@@ -183,7 +183,7 @@ class PolitiquePlusieurs(Validation):
                    commentaire="Valeur "+str(valeur)+ " incorrecte : ajout a la liste refuse: On attend une chaine de caracteres < 8"
                 else :
                    commentaire="Valeur "+str(valeur)+ " incorrecte : ajout a la liste refuse"
-                commentaire2=self.node.item.info_erreur_item()
+                if commentaire2== "" :commentaire2=self.node.item.info_erreur_item()
                 return valide,commentaire,commentaire2,listeRetour
 
              # On valide la liste obtenue
diff --git a/UiQT4/desPlusieursBase.ui b/UiQT4/desPlusieursBase.ui
index f55efe66..0d589ffa 100644
--- a/UiQT4/desPlusieursBase.ui
+++ b/UiQT4/desPlusieursBase.ui
@@ -297,28 +297,12 @@
          </item>
         </layout>
        </item>
-       <item row="3" column="1">
-        <spacer name="spacer3_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>289</width>
-           <height>100</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="4" column="1">
         <widget class="QLabel" name="Commentaire">
          <property name="minimumSize">
           <size>
-           <width>298</width>
-           <height>61</height>
+           <width>300</width>
+           <height>150</height>
           </size>
          </property>
          <property name="text">
@@ -326,22 +310,6 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
-        <spacer name="spacer3_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>265</width>
-           <height>48</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="6" column="1">
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <item>
@@ -390,6 +358,38 @@
          </item>
         </layout>
        </item>
+       <item row="5" column="1">
+        <spacer name="spacer3_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>265</width>
+           <height>48</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="3" column="1">
+        <spacer name="spacer3_3">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>289</width>
+           <height>100</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </widget>
-- 
2.39.2