diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index fc7a59a6e02..886c85bfa62 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 '
';
- print ''.$langs->trans('Constraint').' ';
- print ''.$langs->trans('User').' ';
+ print ''.$langs->trans('ConstraintsToShowOrNotEntry').' ('.$langs->trans("AllMustBeOk").') ';
print ' ';
print " \n";
}
@@ -487,26 +487,13 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
$var = !$var;
print '';
print ''.$objc->action.' ';
- print '';
-
- switch ($objc->user)
- {
- case 0: print 'Interne';
- break;
- case 1: print 'Externe';
- break;
- case 2: print 'Tous';
- break;
- }
- print ' ';
print ''.img_delete().' ';
$i++;
}
print ' ';
- print ''.$langs->trans('Constraints').' ';
- print ''.$langs->trans('User').' ';
+ print ''.$langs->trans('ConstraintsToShowOrNotEntry').' ';
print ' ';
print " \n";
@@ -519,13 +506,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
$var=true;
print '';
print ' ';
- print '';
- print '';
- print 'user==0?' selected="true"':'').'>'.$langs->trans('Internal').' ';
- print 'user==1?' selected="true"':'').'>'.$langs->trans('External').' ';
- print 'user==2?' selected="true"':'').'>Tous ';
- print ' ';
- print ' ';
+ print ' ';
print ' ';
print '';
@@ -553,12 +534,6 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '';
- print '';
- print '';
- print '';
- print 'user==0?' selected="true"':'').'>'.$langs->trans('Internal').' ';
- print 'user==1?' selected="true"':'').'>'.$langs->trans('External').' ';
- print 'user==2?' selected="true"':'').'>Tous ';
print ' ';
print ' ';
print '';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b6531b9aebb..fb7a1dae6de 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 9fe1c4980df..cc45a9063ad 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