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

Merge pull request #380 from marcosgdf/minor

Browse Source 
Modified llx_menu sql and improved add menu form
This commit is contained in:
Regis Houssin 2012-09-10 04:18:31 -07:00
commit e9c72f812d
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@
/* Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
* Copyright (C) 2007-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2011 Regis Houssin <regis@dolibarr.fr>
* Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
*
* 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
@ -164,7 +165,7 @@ if ($action == 'add')
$menu->url=$_POST['url'];
$menu->langs=$_POST['langs'];
$menu->position=$_POST['position'];
$menu->enabled=$_POST['enabled'];
$menu->enabled=(int)$_POST['enabled'];
$menu->perms=$_POST['perms'];
$menu->target=$_POST['target'];
$menu->user=$_POST['user'];
@ -334,7 +335,10 @@ if ($action == 'create')
print '</select></td></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
// Enabled
print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" size="60" name="enabled" value="'.$_POST["enabled"].'"></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
print '<tr><td>'.$langs->trans('Enabled').'</td><td><select class="flat" name="enabled">
<option value="0"'.(isset($_POST['enabled']) ? ($_POST['enabled'] == 0 ? 'selected="true"' : '') : 'selected="true"').'>'.$langs->trans('No').'</option>
<option value="1"'.(isset($_POST['enabled']) && ($_POST['enabled'] == 1) ? 'selected="true"' : '').'>'.$langs->trans('Yes').'</option>
</select></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
// Perms
print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" size="60" name="perms" value="'.$_POST["perms"].'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';
@ -414,7 +418,10 @@ elseif ($action == 'edit')
print '</select></td><td>'.$langs->trans('DetailTarget').'</td></tr>';
// Enabled
print '<tr><td>'.$langs->trans('Enabled').'</td><td><input type="text" size="60" name="enabled" value="'.$menu->enabled.'"></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
print '<tr><td>'.$langs->trans('Enabled').'</td><td><select class="flat" name="enabled">
<option value="0"'.($menu->enabled == 0 ? 'selected="true"' : '').'>'.$langs->trans('No').'</option>
<option value="1"'.($menu->enabled == 1 ? 'selected="true"' : '').'>'.$langs->trans('Yes').'</option>
</select></td><td>'.$langs->trans('DetailEnabled').'</td></tr>';
// Perms
print '<tr><td>'.$langs->trans('Rights').'</td><td><input type="text" size="60" name="perms" value="'.$menu->perms.'"></td><td>'.$langs->trans('DetailRight').'</td></tr>';

2
htdocs/install/mysql/migration/3.2.0-3.3.0.sql
View File

@ -206,3 +206,5 @@ alter table llx_facturedet add column localtax2_type char(1) after localtax2_tx;
alter table llx_propaldet add column localtax1_type char(1) after localtax1_tx;
alter table llx_propaldet add column localtax2_type char(1) after localtax2_tx;
-- END TASK #204
ALTER TABLE llx_menu CHANGE enabled enabled TINYINT(1) UNSIGNED NULL DEFAULT '1';

3
htdocs/install/mysql/tables/llx_menu.sql
View File

@ -2,6 +2,7 @@
-- Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
-- Copyright (C) 2007-2008 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
-- Copyright (C) 2012 Marcos García <marcosgdf@gmail.com>
--
-- 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
@ -38,7 +39,7 @@ CREATE TABLE llx_menu
langs varchar(100), -- Lang file to load for translation
level smallint, -- Deprecated. Not used.
perms varchar(255), -- Condition to show enabled or disabled
enabled varchar(255) NULL default '1', -- Condition to show or hide
enabled tinyint(1) UNSIGNED NULL default '1', -- Condition to show or hide
usertype integer NOT NULL default '0', -- 0 if menu for all users, 1 for external only, 2 for internal only
tms timestamp
) ENGINE=innodb;