From fd9947479bb7010187225209b3fa2dc4f1f4c2dc Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Tue, 6 Feb 2007 09:42:09 +0000
Subject: [PATCH] =?UTF-8?q?Gestion=20erreur=20cr=E9ation=20type=20adh=E9re?=
 =?UTF-8?q?nt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/adherents/type.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index e7389281104..9cf9cb165b3 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -64,7 +64,8 @@ if ($_POST["action"] == 'add')
         }
         else
         {
-        	$mesg=$this->langs("ErrorFieldRequired",$langs->trans("Label"));
+        	$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Label"));
+			$_GET["action"] = 'create';
         }
     }
 }
@@ -97,11 +98,11 @@ if ($_GET["action"] == 'delete')
 	Header("Location: liste.php");
 	exit;
 }
+
 if ($_GET["action"] == 'commentaire')
 {
 	$don = new Don($db);
 	$don->set_commentaire($rowid,$_POST["commentaire"]);
-	$action = "edit";
 }
 
 
@@ -136,8 +137,10 @@ if (! $rowid && $_GET["action"] != 'create' && $_GET["action"] != 'edit')
       
       print '<tr class="liste_titre">';
       print '<td>'.$langs->trans("Ref").'</td>';
-      print '<td>'.$langs->trans("Label").'</td><td align="center">'.$langs->trans("SubscriptionRequired").'</td>';
-      print '<td align="center">'.$langs->trans("VoteAllowed").'</td><td>&nbsp;</td>';
+      print '<td>'.$langs->trans("Label").'</td>';
+	  print '<td align="center">'.$langs->trans("SubscriptionRequired").'</td>';
+      print '<td align="center">'.$langs->trans("VoteAllowed").'</td>';
+	  print '<td>&nbsp;</td>';
       print "</tr>\n";
       
       $var=True;
@@ -189,6 +192,8 @@ if ($_GET["action"] == 'create')
   print_titre($langs->trans("NewMemberType"));
   print '<br>';
   
+  if ($mesg) print '<div class="error">'.$mesg.'</div>';
+  
   print "<form action=\"type.php\" method=\"post\">";
   print '<table class="border" width="100%">';
   
@@ -197,11 +202,11 @@ if ($_GET["action"] == 'create')
   print '<tr><td>'.$langs->trans("Label").'</td><td><input type="text" name="libelle" size="40"></td></tr>';  
 
   print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';
-  $htmls->selectyesnonum("cotisation","");
+  $htmls->selectyesnonum("cotisation",1);
   print '</tr>';
   
   print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
-  $htmls->selectyesnonum("vote","");
+  $htmls->selectyesnonum("vote",0);
   print '</tr>';
 
   print '<tr><td valign="top">'.$langs->trans("Comments").'</td><td>';