diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php index c859e80e553..d0619ec80de 100644 --- a/htdocs/admin/menus/edit.php +++ b/htdocs/admin/menus/edit.php @@ -2,6 +2,7 @@ /* Copyright (C) 2007 Patrick Raguin * Copyright (C) 2007-2011 Laurent Destailleur * Copyright (C) 2009-2011 Regis Houssin + * Copyright (C) 2012 Marcos García * * 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 ''.$langs->trans('DetailTarget').''; // Enabled - print ''.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').''; + print ''.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').''; // Perms print ''.$langs->trans('Rights').''.$langs->trans('DetailRight').''; @@ -414,7 +418,10 @@ elseif ($action == 'edit') print ''.$langs->trans('DetailTarget').''; // Enabled - print ''.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').''; + print ''.$langs->trans('Enabled').''.$langs->trans('DetailEnabled').''; // Perms print ''.$langs->trans('Rights').''.$langs->trans('DetailRight').''; diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql index 1d1bfff98b4..28d008097dc 100755 --- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql +++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql @@ -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'; \ No newline at end of file diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql index 78d5dd68e09..9e9e9bf67de 100644 --- a/htdocs/install/mysql/tables/llx_menu.sql +++ b/htdocs/install/mysql/tables/llx_menu.sql @@ -2,6 +2,7 @@ -- Copyright (C) 2007 Patrick Raguin -- Copyright (C) 2007-2008 Laurent Destailleur -- Copyright (C) 2009 Regis Houssin +-- Copyright (C) 2012 Marcos García -- -- 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;