diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index fc7a59a6e024a8f0b76f12db2983b40253db4a9d..886c85bfa62f4563cd0a3231484d15fc4c6ebcdb 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -185,7 +185,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'add_const') if($_POST['type'] == 'prede') { - $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_const(fk_menu, fk_constraint, user) VALUES(".$_POST['menuId'].",".$_POST['constraint'].",".$_POST['user'].")"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_const(fk_menu, fk_constraint) VALUES(".$_POST['menuId'].",".$_POST['constraint'].")"; } else { @@ -198,7 +198,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'add_const') $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_constraint(rowid,action) VALUES(".$constraint.",'".$_POST['constraint']."')"; $db->query($sql); - $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_const(fk_menu, fk_constraint, user) VALUES(".$_POST['menuId'].",".$constraint.",".$_POST['user'].")"; + $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu_const(fk_menu, fk_constraint) VALUES(".$_POST['menuId'].",".$constraint.")"; } $db->query($sql); @@ -457,11 +457,12 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') /* * Lignes de contraintes */ - $sql = 'SELECT c.rowid, c.action, mc.user '; - $sql.= 'FROM '.MAIN_DB_PREFIX.'menu_constraint as c, '.MAIN_DB_PREFIX.'menu_const as mc '; - $sql.= 'WHERE c.rowid = mc.fk_constraint '; - $sql.= 'AND mc.fk_menu = '.$_GET['menuId']; + $sql = 'SELECT c.rowid, c.action'; + $sql.= ' FROM '.MAIN_DB_PREFIX.'menu_constraint as c, '.MAIN_DB_PREFIX.'menu_const as mc'; + $sql.= ' WHERE c.rowid = mc.fk_constraint'; + $sql.= ' AND mc.fk_menu = '.$_GET['menuId']; + dolibarr_syslog("Edit: sql=".$sql, LOG_DEBUG); $resql = $db->query($sql); if ($resql) { @@ -472,8 +473,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') if ($num) { print '<tr class="liste_titre">'; - print '<td>'.$langs->trans('Constraint').'</td>'; - print '<td>'.$langs->trans('User').'</td>'; + print '<td>'.$langs->trans('ConstraintsToShowOrNotEntry').' ('.$langs->trans("AllMustBeOk").')</td>'; print '<td width="16"> </td>'; print "</tr>\n"; } @@ -487,26 +487,13 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') $var = !$var; print '<tr '.$bc[$var].'>'; print '<td>'.$objc->action.'</td>'; - print '<td>'; - - switch ($objc->user) - { - case 0: print 'Interne'; - break; - case 1: print 'Externe'; - break; - case 2: print 'Tous'; - break; - } - print '</td>'; print '<td align="center"><a href="edit.php?action=del_const&menuId='.$_GET['menuId'].'&constId='.$objc->rowid.'">'.img_delete().'</a></td>'; $i++; } print '<tr class="liste_titre">'; - print '<td>'.$langs->trans('Constraints').'</td>'; - print '<td width="250">'.$langs->trans('User').'</td>'; + print '<td>'.$langs->trans('ConstraintsToShowOrNotEntry').'</td>'; print '<td width="16"> </td>'; print "</tr>\n"; @@ -519,13 +506,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') $var=true; print '<tr '.$bc[$var].'>'; print ' <td><textarea cols="70" name="constraint" rows="1"></textarea></td>'; - print '<td>'; - print '<select name="user">'; - print '<option value="0"'.($menu->user==0?' selected="true"':'').'>'.$langs->trans('Internal').'</option>'; - print '<option value="1"'.($menu->user==1?' selected="true"':'').'>'.$langs->trans('External').'</option>'; - print '<option value="2"'.($menu->user==2?' selected="true"':'').'>Tous</option>'; - print '</td>'; - print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>'; + print ' <td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>'; print '</tr>'; print '</form>'; @@ -553,12 +534,6 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit') print '</select>'; - print '</td>'; - print '<td>'; - print '<select name="user">'; - print '<option value="0"'.($menu->user==0?' selected="true"':'').'>'.$langs->trans('Internal').'</option>'; - print '<option value="1"'.($menu->user==1?' selected="true"':'').'>'.$langs->trans('External').'</option>'; - print '<option value="2"'.($menu->user==2?' selected="true"':'').'>Tous</option>'; print '</td>'; print '<td align="center"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>'; print '</tr>'; diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index b6531b9aebb35024ee394236290e9bbc2bf7b68c..fb7a1dae6de4ac977944a12a9228538d7fdf53c4 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -470,6 +470,8 @@ TableLineFormat=Line format NbOfRecord=Nb of records Constraints=Constraints ConstraintsType=Constraint's type +ConstraintsToShowOrNotEntry=Constraint to show or not the menu entry +AllMustBeOk=All must be checked Host=Server DriverType=Driver type SummarySystem=System information summary diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 9fe1c4980df36838128ee586881bbd94436dbb21..cc45a9063ad1c32af53aac859201d8cbdbbe70dd 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -468,6 +468,8 @@ TableLineFormat=Format lignes NbOfRecord=Nb d'enr. Constraints=Contraintes ConstraintsType=Type de contrainte +ConstraintsToShowOrNotEntry=Contrainte pour afficher ou non le menu +AllMustBeOk=Toutes doivent etre respect�es Host=Serveur DriverType=Type du driver SummarySystem=R�sum� des informations syst�mes Dolibarr