lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Debuggage editeur de menu

Browse Source
This commit is contained in:
Laurent Destailleur 2007-06-05 22:30:46 +00:00
parent f846229309
commit a6bb2daf5b
5 changed files with 189 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -2,17 +2,17 @@ English Dolibarr changelog
***** Changelog for 2.2 compared to 2.1 ***** ***** Changelog for 2.2 compared to 2.1 *****
- Added more statistics on main page. - Add more statistics on main page.
- Added option to add message on login page. - Add option to add message on login page.
- Management of categories for third parties. - Management of categories for third parties.
- Adde volume on products properties. - Add volume on products properties.
- Support LDAP authentication. - Support for LDAP authentication.
- Full member synchronisation with LDAP database in - Full member synchronisation with LDAP database in
fundation module. fundation module.
- More LDAP fields supported for user synchronization. - More LDAP fields supported for user synchronization.
- Better logger for install. - Better logger for install.
- First changes to support UTF8. - First changes to support UTF8.
- Added a "forget password" feature. - Add a "forget password" feature.
- Setup process can run several migrate files if need - Setup process can run several migrate files if need
to jump several versions to upgrade. to jump several versions to upgrade.
- Support for webcalendar 1.1 in webcalendar module. - Support for webcalendar 1.1 in webcalendar module.

207
htdocs/admin/menus/edit.php
View File

@ -29,10 +29,18 @@
require("./pre.inc.php"); require("./pre.inc.php");
if (! $user->admin)
if (!$user->admin)
accessforbidden(); accessforbidden();
$menu_handler_top=$conf->global->MAIN_MENU_BARRETOP;
$menu_handler_left=$conf->global->MAIN_MENU_BARRELEFT;
$menu_handler_top=eregi_replace('_backoffice\.php','',$menu_handler_top);
$menu_handler_top=eregi_replace('_frontoffice\.php','',$menu_handler_top);
$menu_handler_left=eregi_replace('_backoffice\.php','',$menu_handler_left);
$menu_handler_left=eregi_replace('_frontoffice\.php','',$menu_handler_left);
$menu_handler=$menu_handler_left;
/* /*
* Actions * Actions
@ -40,8 +48,6 @@ if (!$user->admin)
if (isset($_GET["action"]) && $_GET["action"] == 'update') if (isset($_GET["action"]) && $_GET["action"] == 'update')
{ {
if(!$_POST['cancel']) if(!$_POST['cancel'])
{ {
@ -54,10 +60,12 @@ if (isset($_GET["action"]) && $_GET["action"] == 'update')
if($_GET['return']) if($_GET['return'])
{ {
header("location: index.php"); header("location: index.php");
exit;
} }
else else
{ {
header("location: edit.php?action=edit&menuId=".$_POST['menuId']); header("location: edit.php?action=edit&menuId=".$_POST['menuId']);
exit;
} }
@ -65,89 +73,70 @@ if (isset($_GET["action"]) && $_GET["action"] == 'update')
if (isset($_GET["action"]) && $_GET["action"] == 'add') if (isset($_GET["action"]) && $_GET["action"] == 'add')
{ {
if ($_POST['cancel'])
if($_POST['cancel'])
{ {
header("location:index.php"); header("location:index.php");
exit;
} }
else
{
if($_POST['level'] == -1) $error=0;
if (! $error && ! $_POST['handler'])
{ {
$sql = "SELECT max(m.rowid) as maxId FROM ".MAIN_DB_PREFIX."menu as m WHERE m.level = ".$_POST['level']; $mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",'handler').'</div>';
$_GET["action"] = 'create';
$error++;
}
if (! $error && ! $_POST['type'])
{
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",'type').'</div>';
$_GET["action"] = 'create';
$error++;
}
if (! $error && ! $_POST['url'])
{
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Url")).'</div>';
$_GET["action"] = 'create';
$error++;
}
if (! $error && ! $_POST['titre'])
{
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("Title")).'</div>';
$_GET["action"] = 'create';
$error++;
}
if (! $error)
{
$sql = "SELECT max(m.rowid) as maxId FROM ".MAIN_DB_PREFIX."menu as m";
$result = $db->query($sql); $result = $db->query($sql);
$lastMenu = $db->fetch_object($result); $lastMenu = $db->fetch_object($result);
$rowid = $lastMenu->maxId + 1; $rowid = $lastMenu->maxId + 1;
$sql = "SELECT max(m.order) as maxOrder FROM ".MAIN_DB_PREFIX."menu as m WHERE m.level = ".$_POST['level']; // On prend le max de toutes celles qui auront le meme pere fk_menu
$sql = "SELECT max(m.order) as maxOrder FROM ".MAIN_DB_PREFIX."menu as m WHERE m.fk_menu = ".$_POST['menuId'];
$result = $db->query($sql); $result = $db->query($sql);
$lastMenu = $db->fetch_object($result); $lastMenu = $db->fetch_object($result);
$order = $lastMenu->maxOrder + 1; if ($lastMenu) $order = $lastMenu->maxOrder + 1;
}
elseif($_POST['level'] == 0)
{
$sql = "SELECT max(m.rowid) as maxId FROM ".MAIN_DB_PREFIX."menu as m WHERE m.level = ".$_POST['level'];
$result = $db->query($sql);
$lastMenu = $db->fetch_object($result);
$rowid = $lastMenu->maxId + 100 ;
$sql = "SELECT max(m.order) as maxOrder FROM ".MAIN_DB_PREFIX."menu as m WHERE m.fk_menu = ".$_GET['menuId'];
$result = $db->query($sql);
$lastMenu = $db->fetch_object($result);
if(isset($lastMenu->maxOrder))
{
$order = ($lastMenu->maxOrder) + 1;
}
else else
{ {
$order = 0; dolibarr_print_error($db);
} }
} $sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(rowid,menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, `right`, target, user, `order`)";
elseif($_POST['level'] > 0) $sql.=" VALUES(".$rowid.",'".$_POST['handler']."','".$_POST['type']."','".$_POST['mainmenu']."','".$_POST['leftmenu']."',".$_POST['menuId'].",'".$_POST['url']."','".$_POST['titre']."','".$_POST['level']."','".$_POST['langs']."','".$_POST['right']."','".$_POST['target']."',".$_POST['user'].",0)";
{
$parentId = round($_GET['menuId'] / 100); dolibarr_syslog("edit: insert menu entry sql=".$sql);
$sql = "SELECT max(m.rowid) as maxId FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid LIKE '".$parentId."__' AND m.rowid <> '".$parentId."00'";
$result = $db->query($sql);
$lastMenu = $db->fetch_object($result);
if(isset($lastMenu->maxId))
{
$rowid = ($lastMenu->maxId) + 1;
}
else
{
$rowid = ($parentId * 100) + 1;
}
$sql = "SELECT max(m.order) as maxOrder FROM ".MAIN_DB_PREFIX."menu as m WHERE m.fk_menu = ".$_GET['menuId'];
$result = $db->query($sql);
$lastMenu = $db->fetch_object($result);
if(isset($lastMenu->maxOrder))
{
$order = ($lastMenu->maxOrder) + 1;
}
else
{
$order = 0;
}
}
$sql = "INSERT INTO ".MAIN_DB_PREFIX."menu(rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, right, target, user, order)";
$sql.=
$sql.=" VALUES($rowid, '".$_POST['menu_hanlder']."','".$_POST['type']."','".$_POST['mainmenu']."','".$_POST['leftmenu']."',".$_GET['menuId'].",'".$_POST['url']."','".$_POST['titre']."',".$_POST['level'].",'".$_POST['langs']."','".$_POST['right']."','".$_POST['target']."',".$_POST['user'].",".$order.")";
$result=$db->query($sql); $result=$db->query($sql);
if ($result > 0)
{
dolibarr_syslog("location: edit.php?action=edit&menuId=".$rowid);
header("location: edit.php?action=edit&menuId=".$rowid); header("location: edit.php?action=edit&menuId=".$rowid);
exit;
}
else
{
$mesg='<div class="error">'.'FailedToInsert'.$db->lasterror().' sql='.$sql.'</div>';
$_GET["action"] = 'create';
}
} }
} }
@ -176,7 +165,7 @@ if (isset($_GET["action"]) && $_GET["action"] == 'add_const')
$db->query($sql); $db->query($sql);
header("location:edit.php?action=edit&menuId=".$_POST['menuId']); header("location:edit.php?action=edit&menuId=".$_POST['menuId']);
exit;
} }
if (isset($_GET["action"]) && $_GET["action"] == 'del_const') if (isset($_GET["action"]) && $_GET["action"] == 'del_const')
@ -194,14 +183,12 @@ if (isset($_GET["action"]) && $_GET["action"] == 'del_const')
} }
header("location:edit.php?action=edit&menuId=".$_GET['menuId']); header("location:edit.php?action=edit&menuId=".$_GET['menuId']);
exit;
} }
// Suppression
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
{ {
$sql = "SELECT c.rowid, c.fk_constraint FROM ".MAIN_DB_PREFIX."menu_const as c WHERE c.fk_menu = ".$_GET['menuId']; $sql = "SELECT c.rowid, c.fk_constraint FROM ".MAIN_DB_PREFIX."menu_const as c WHERE c.fk_menu = ".$_GET['menuId'];
$res = $db->query($sql); $res = $db->query($sql);
if ($res) if ($res)
@ -226,7 +213,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
} }
;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId']; $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId'];
$db->query($sql); $db->query($sql);
@ -258,6 +245,8 @@ if (isset($_GET["action"]) && $_GET["action"] == 'create')
{ {
print_titre($langs->trans("NewMenu"),'','setup'); print_titre($langs->trans("NewMenu"),'','setup');
if ($mesg) print $mesg;
print '<form action="./edit.php?action=add&menuId='.$_GET['menuId'].'" method="post" name="formmenucreate">'; print '<form action="./edit.php?action=add&menuId='.$_GET['menuId'].'" method="post" name="formmenucreate">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -286,12 +275,31 @@ if (isset($_GET["action"]) && $_GET["action"] == 'create')
} }
} }
// MenuId Parent
print '<tr><td><b>'.$langs->trans('MenuIdParent').'</b></td>';
//$menu_handler
//print '<td><input type="text" size="50" name="handler" value="all"></td>';
print '<td><input type="text" size="50" name="menuId" value="0"></td>';
print '<td>'.$langs->trans('DetailMenuIdParent').'</td></tr>';
//Handler //Handler
print '<tr><td>'.$langs->trans('MenuHandler').'</td><td><input type="text" size="50" name="handler" value="'.$handler.'"></td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>'; print '<tr><td><b>'.$langs->trans('MenuHandler').'</b></td>';
//Handler //$menu_handler
print '<tr><td>'.$langs->trans('Type').'</td><td><input type="text" size="50" name="type" value="'.$type.'"></td><td>'.$langs->trans('DetailType').'</td></tr>'; //print '<td><input type="text" size="50" name="handler" value="all"></td>';
print '<td><input type="text" size="50" name="handler" value="'.$menu_handler.'"></td>';
print '<td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
// Type
print '<tr><td><b>'.$langs->trans('Type').'</b></td><td>';
print '<select name="type" class="flat">';
print '<option value="">&nbsp;</option>';
print '<option value="top">Top</option>';
print '<option value="left">Left</option>';
print '</select>';
// print '<input type="text" size="50" name="type" value="'.$type.'">';
print '</td><td>'.$langs->trans('DetailType').'</td></tr>';
//User //User
print '<tr><td>'.$langs->trans('User').'</td>'; print '<tr><td><b>'.$langs->trans('User').'</b></td>';
print '<td><select class="flat" name="user">'; print '<td><select class="flat" name="user">';
print '<option value="0">'.$langs->trans('Interne').'</option>'; print '<option value="0">'.$langs->trans('Interne').'</option>';
print '<option value="1">'.$langs->trans('Externe').'</option>'; print '<option value="1">'.$langs->trans('Externe').'</option>';
@ -301,11 +309,11 @@ if (isset($_GET["action"]) && $_GET["action"] == 'create')
//Level //Level
print '<input type="hidden" size="50" name="level" value="'.($parent_level + 1).'">'; print '<input type="hidden" size="50" name="level" value="'.($parent_level + 1).'">';
//Titre //Titre
print '<tr><td>'.$langs->trans('Title').'</td><td><input type="text" size="50" name="titre" value=""></td><td>'.$langs->trans('DetailTitre').'</td></tr>'; print '<tr><td><b>'.$langs->trans('Title').'</b></td><td><input type="text" size="50" name="titre" value=""></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
//URL
print '<tr><td><b>'.$langs->trans('URL').'</b></td><td><input type="text" size="50" name="url" value=""></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
//Langs //Langs
print '<tr><td>'.$langs->trans('Langs').'</td><td><input type="text" size="50" name="langs" value="'.$parent_langs.'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>'; print '<tr><td>'.$langs->trans('Langs').'</td><td><input type="text" size="50" name="langs" value="'.$parent_langs.'"></td><td>'.$langs->trans('DetailLangs').'</td></tr>';
//URL
print '<tr><td>'.$langs->trans('URL').'</td><td><input type="text" size="50" name="url" value=""></td><td>'.$langs->trans('DetailUrl').'</td></tr>';
//Target //Target
print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">'; print '<tr><td>'.$langs->trans('Target').'</td><td><select class="flat" name="target">';
print '<option value=""'.($menu->target==""?' selected="true"':'').'>'.$langs->trans('').'</option>'; print '<option value=""'.($menu->target==""?' selected="true"':'').'>'.$langs->trans('').'</option>';
@ -315,9 +323,9 @@ if (isset($_GET["action"]) && $_GET["action"] == 'create')
print '<tr><td>'.$langs->trans('Right').'</td><td><input type="text" size="50" name="right" value=""></td><td>'.$langs->trans('DetailRight').'</td></tr>'; print '<tr><td>'.$langs->trans('Right').'</td><td><input type="text" size="50" name="right" value=""></td><td>'.$langs->trans('DetailRight').'</td></tr>';
//Mainmenu = group //Mainmenu = group
print '<tr><td>'.$langs->trans('Group').'</td><td><input type="text" size="50" name="mainmenu" value="'.$mainmenu.'"></td><td>'.$langs->trans('DetailMainmenu').'</td></tr>'; //print '<tr><td>'.$langs->trans('Group').'</td><td><input type="text" size="50" name="mainmenu" value="'.$mainmenu.'"></td><td>'.$langs->trans('DetailMainmenu').'</td></tr>';
//Leftmenu //Leftmenu
print '<tr><td>'.$langs->trans('Leftmenu').'</td><td><input type="text" size="50" name="leftmenu" value=""></td><td>'.$langs->trans('DetailLeftmenu').'</td></tr>'; //print '<tr><td>'.$langs->trans('Leftmenu').'</td><td><input type="text" size="50" name="leftmenu" value=""></td><td>'.$langs->trans('DetailLeftmenu').'</td></tr>';
// Boutons // Boutons
print '<tr><td colspan="3" align="center"><input type="submit" class="button" name="save" value="Enregistrer">'; print '<tr><td colspan="3" align="center"><input type="submit" class="button" name="save" value="Enregistrer">';
@ -337,7 +345,6 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
$sql = "SELECT m.rowid, m.menu_handler, m.type, m.titre, m.mainmenu, m.leftmenu, m.fk_menu, m.url, m.langs, m.level, m.right, m.target, m.user, m.order"; $sql = "SELECT m.rowid, m.menu_handler, m.type, m.titre, m.mainmenu, m.leftmenu, m.fk_menu, m.url, m.langs, m.level, m.right, m.target, m.user, m.order";
$sql.=" FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId']; $sql.=" FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId'];
$result = $db->query($sql); $result = $db->query($sql);
@ -350,10 +357,16 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
{ {
$menu = $db->fetch_object($result); $menu = $db->fetch_object($result);
// MenuId Parent
print '<tr><td>'.$langs->trans('MenuIdParent').'</td>';
//$menu_handler
//print '<td><input type="text" size="50" name="handler" value="all"></td>';
print '<td>'.$menu->fk_menu.'</td>';
print '<td>'.$langs->trans('DetailMenuIdParent').'</td></tr>';
print '<input type="hidden" name="menuId" value="'.$_GET['menuId'].'">';
// Id // Id
print '<input type="hidden" name="menuId" value="'.$_GET['menuId'].'">'; print '<tr><td>'.$langs->trans('Id').'</td><td>'.$menu->rowid.'</td><td>'.$langs->trans('DetailId').'</td></tr>';
print '<tr><td>'.$langs->trans('rowid').'</td><td>'.$menu->rowid.'</td><td>'.$langs->trans('DetailId').'</td></tr>';
// Handler // Handler
print '<tr><td>'.$langs->trans('MenuHandler').'</td><td>'.$menu->menu_handler.'</td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>'; print '<tr><td>'.$langs->trans('MenuHandler').'</td><td>'.$menu->menu_handler.'</td><td>'.$langs->trans('DetailMenuHandler').'</td></tr>';
@ -369,7 +382,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '<tr><td>'.$langs->trans('Type').'</td><td>'.$menu->type.'</td><td>'.$langs->trans('DetailType').'</td></tr>'; print '<tr><td>'.$langs->trans('Type').'</td><td>'.$menu->type.'</td><td>'.$langs->trans('DetailType').'</td></tr>';
// Niveau // Niveau
print '<tr><td>'.$langs->trans('Level').'</td><td>'.$menu->level.'</td><td>'.$langs->trans('DetailLevel').'</td></tr>'; //print '<tr><td>'.$langs->trans('Level').'</td><td>'.$menu->level.'</td><td>'.$langs->trans('DetailLevel').'</td></tr>';
// Titre // Titre
print '<tr><td>'.$langs->trans('Title').'</td><td><input type="text" size="70" name="titre" value="'.$menu->titre.'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>'; print '<tr><td>'.$langs->trans('Title').'</td><td><input type="text" size="70" name="titre" value="'.$menu->titre.'"></td><td>'.$langs->trans('DetailTitre').'</td></tr>';
@ -389,9 +402,9 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '<tr><td>'.$langs->trans('Right').'</td><td><input type="text" size="70" name="right" value="'.$menu->right.'"></td><td>'.$langs->trans('DetailRight').'</td></tr>'; print '<tr><td>'.$langs->trans('Right').'</td><td><input type="text" size="70" name="right" value="'.$menu->right.'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';
// Leftmenu // Leftmenu
print '<tr><td>'.$langs->trans('Leftmenu').'</td><td><input type="text" size="70" name="leftmenu" value="'.htmlentities($menu->leftmenu).'"></td><td>'.$langs->trans('DetailLeftmenu').'</td></tr>'; //print '<tr><td>'.$langs->trans('Leftmenu').'</td><td><input type="text" size="70" name="leftmenu" value="'.htmlentities($menu->leftmenu).'"></td><td>'.$langs->trans('DetailLeftmenu').'</td></tr>';
// Mainmenu = group // Mainmenu = group
print '<tr><td>'.$langs->trans('Group').'</td><td><input type="text" size="70" name="mainmenu" value="'.$menu->mainmenu.'"></td><td>'.$langs->trans('DetailMainmenu').'</td></tr>'; //print '<tr><td>'.$langs->trans('Group').'</td><td><input type="text" size="70" name="mainmenu" value="'.$menu->mainmenu.'"></td><td>'.$langs->trans('DetailMainmenu').'</td></tr>';
// Bouton // Bouton
print '<tr><td colspan="3" align="center"><input type="submit" class="button" name="save" value="Enregistrer">'; print '<tr><td colspan="3" align="center"><input type="submit" class="button" name="save" value="Enregistrer">';
@ -496,7 +509,7 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
while ($i < $num) while ($i < $num)
{ {
$objc = $db->fetch_object($resql); $objc = $db->fetch_object($resql);
print '<option value="'.$objc->rowid.'">'.$objc->action.'</option>'; print '<option value="'.$objc->rowid.'">'.dolibarr_trunc($objc->action,70).'</option>';
$i++; $i++;
} }
@ -523,18 +536,12 @@ elseif (isset($_GET["action"]) && $_GET["action"] == 'edit')
print '</table>'; print '</table>';
print '<div class="tabsAction">';
print '<a class="butAction" href="edit.php?action=update&menuId='.$_GET['menuId'].'&amp;return=1">'.$langs->trans('Valid').'</a>';
print '<a class="butActionDelete" href="edit.php?menuId='.$_GET['menuId'].'&amp;action=delete">'.$langs->trans('Supprimer').'</a>';
print '</div>';
} }
print '</div>';
$db->close();
llxFooter('$Date$ - $Revision$');
?> ?>

70
htdocs/admin/menus/index.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com> /* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2007 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -28,7 +29,7 @@
require("./pre.inc.php"); require("./pre.inc.php");
if (!$user->rights->menudb->creer && ! $user->admin) if (! $user->admin)
accessforbidden(); accessforbidden();
@ -129,35 +130,6 @@ if (isset($_GET["action"]) && $_GET["action"] == 'down')
$db->query($sql); $db->query($sql);
} }
/*
* Affichage page
*/
llxHeader();
print_fiche_titre($langs->trans("Menus"),'','setup');
print $langs->trans("MenusEditorDesc")."<br>\n";
print "<br>\n";
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/menus.php";
$head[$h][1] = $langs->trans("MenuHandlers");
$head[$h][2] = 'handler';
$h++;
$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php";
$head[$h][1] = $langs->trans("MenuAdmin");
$head[$h][2] = 'editor';
$h++;
dolibarr_fiche_head($head, 'editor', $langs->trans("Menus"));
if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes') if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
{ {
$sql = "SELECT c.rowid, c.fk_constraint FROM ".MAIN_DB_PREFIX."menu_const as c WHERE c.fk_menu = ".$_GET['menuId']; $sql = "SELECT c.rowid, c.fk_constraint FROM ".MAIN_DB_PREFIX."menu_const as c WHERE c.fk_menu = ".$_GET['menuId'];
@ -184,7 +156,7 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
} }
;
$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId']; $sql = "DELETE FROM ".MAIN_DB_PREFIX."menu WHERE rowid = ".$_GET['menuId'];
$db->query($sql); $db->query($sql);
@ -202,23 +174,47 @@ if ($_POST["action"] == 'confirm_delete' && $_POST["confirm"] == 'yes')
} }
} }
/*
* Affichage page
*/
llxHeader();
print_fiche_titre($langs->trans("Menus"),'','setup');
print $langs->trans("MenusEditorDesc")."<br>\n";
print "<br>\n";
$h = 0;
$head[$h][0] = DOL_URL_ROOT."/admin/menus.php";
$head[$h][1] = $langs->trans("MenuHandlers");
$head[$h][2] = 'handler';
$h++;
$head[$h][0] = DOL_URL_ROOT."/admin/menus/index.php";
$head[$h][1] = $langs->trans("MenuAdmin");
$head[$h][2] = 'editor';
$h++;
dolibarr_fiche_head($head, 'editor', $langs->trans("Menus"));
// Confirmation de la suppression de la facture // Confirmation de la suppression de la facture
if ($_GET["action"] == 'delete') if ($_GET["action"] == 'delete')
{ {
$sql = "SELECT m.titre FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId']; $sql = "SELECT m.titre FROM ".MAIN_DB_PREFIX."menu as m WHERE m.rowid = ".$_GET['menuId'];
$result = $db->query($sql); $result = $db->query($sql);
$obj = $db->fetch_object($result); $obj = $db->fetch_object($result);
$html = new Form($db); $html = new Form($db);
$html->form_confirm("index.php?menuId=".$_GET['menuId'],$langs->trans("DeleteMenu"),$langs->trans("ConfirmDeleteMenu")." ".$obj->titre,"confirm_delete"); $html->form_confirm("index.php?menuId=".$_GET['menuId'],$langs->trans("DeleteMenu"),$langs->trans("ConfirmDeleteMenu",$obj->titre),"confirm_delete");
print "<br />\n"; print "<br />\n";
} }
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr>'; print '<tr>';
@ -226,7 +222,7 @@ print '<td>'.$langs->trans("MenuHandler").': <b>'.$menu_handler.'</b></td>';
print '</tr>'; print '</tr>';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("TreeMenu").'</td>'; print '<td>'.$langs->trans("TreeMenuPersonalized").'</td>';
print '</tr>'; print '</tr>';
print '<tr>'; print '<tr>';

23
htdocs/langs/en_US/admin.lang
View File

@ -721,3 +721,26 @@ MantisErrorConnectOkButWrongDatabase=Connection succeeded but database doesn't l
##### Stock ##### ##### Stock #####
StockSetup=Configuration module stock StockSetup=Configuration module stock
UserWarehouse=Use user personal stocks UserWarehouse=Use user personal stocks
##### Menu #####
MenuDeleted=Menu deleted
TreeMenu=Tree menus
TreeMenuPersonalized=Personalized menus
NewMenu=New menu
MenuConf=Menus setup
Menu=Selection of menu
MenuHandler=Manu handler
DetailId=Id menu
DetailMenuHandler=Menu handler (or "all" for all menu handlers)
DetailType=Type of menu (top or left)
DetailTitre=Menu label
DetailMainmenu=Groupe auquel il appartient (obsolete)
DetailUrl=URL where menu send you
DetailLeftmenu=Condition d'affichage ou non (obsolete)
DetailRight=Condition to display unauthorized grey menus
DetailLangs=Lang file name for label translation
DetailUser=Intern / Extern / All
DetailTarget=Target
DetailLevel=Niveau (-1:menu top, 0:entete menu, >0 menu et sous menu)
ModifMenu=Menu change
DeleteMenu=Delete menu entry
ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b> ?

7
htdocs/langs/fr_FR/admin.lang
View File

@ -735,12 +735,13 @@ mailDroitPret=Adresse mail
##### Menu ##### ##### Menu #####
MenuDeleted=Menu supprimé MenuDeleted=Menu supprimé
TreeMenu=Arborescence des menus TreeMenu=Arborescence des menus
TreeMenuPersonalized=Menus personalisés
NewMenu=Nouveau menu NewMenu=Nouveau menu
MenuConf=Configuration des menus MenuConf=Configuration des menus
Menu=Sélection des menus Menu=Sélection des menus
MenuHandler=Gestionnaire menu MenuHandler=Gestionnaire menu
DetailId=Identifiant du menu DetailId=Identifiant du menu
DetailMenuHandler=Nom du gestionnaire menu DetailMenuHandler=Nom du gestionnaire menu (ou "all" pour tous)
DetailType=Type de menu (top ou left) DetailType=Type de menu (top ou left)
DetailTitre=Libellé du menu DetailTitre=Libellé du menu
DetailMainmenu=Groupe auquel il appartient (obsolete) DetailMainmenu=Groupe auquel il appartient (obsolete)
@ -748,9 +749,11 @@ DetailUrl=URL de la page vers laquelle le menu pointe
DetailLeftmenu=Condition d'affichage ou non (obsolete) DetailLeftmenu=Condition d'affichage ou non (obsolete)
DetailRight=Condition d'affichage plein ou grisé DetailRight=Condition d'affichage plein ou grisé
DetailLangs=Fichier langs pour la traduction du titre DetailLangs=Fichier langs pour la traduction du titre
DetailUser=Interne / externe / Tous DetailUser=Interne / Externe / Tous
DetailTarget=Cible DetailTarget=Cible
DetailLevel=Niveau (-1:menu top, 0:entete menu, >0 menu et sous menu) DetailLevel=Niveau (-1:menu top, 0:entete menu, >0 menu et sous menu)
ModifMenu=Modification du menu ModifMenu=Modification du menu
DeleteMenu=Effacer entrée de menu
ConfirmDeleteMenu=Etes-vous sur de vouloir supprimer l'entrée de menu <b>%s</b> ?