From c59b20d543128e25ac4604d0307ff1972dedd956 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 2 Dec 2008 14:48:08 +0000 Subject: [PATCH] Add list of disabled modules in login info --- htdocs/includes/menus/barre_left/eldy_backoffice.php | 1 - htdocs/includes/menus/barre_top/eldy_backoffice.php | 2 +- htdocs/includes/menus/init_menu_auguria.sql | 3 +++ htdocs/includes/modules/modCashDesk.class.php | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index e0058205e10..a91935cbb8b 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -911,7 +911,6 @@ class MenuLeft { $this->menu_array=$newmenu->liste; } - // Affichage du menu $alt=0; if (! sizeof($this->menu_array)) diff --git a/htdocs/includes/menus/barre_top/eldy_backoffice.php b/htdocs/includes/menus/barre_top/eldy_backoffice.php index b515953d8c4..0d205ce740c 100644 --- a/htdocs/includes/menus/barre_top/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_top/eldy_backoffice.php @@ -329,7 +329,7 @@ class MenuTop { $idsel='id="shop" '; print 'atarget?" target=$this->atarget":"").'>'.$langs->trans("OSCommerce").''; } - + // Members if ($conf->adherent->enabled) { diff --git a/htdocs/includes/menus/init_menu_auguria.sql b/htdocs/includes/menus/init_menu_auguria.sql index 0ea08130ea4..9151ea059a3 100644 --- a/htdocs/includes/menus/init_menu_auguria.sql +++ b/htdocs/includes/menus/init_menu_auguria.sql @@ -27,6 +27,7 @@ insert into `llx_menu` (`rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, insert into `llx_menu` (`rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values (10__+MAX_llx_menu__, 'auguria', 'top', 'energy', '', 0, '/energie/index.php?mainmenu=energy&leftmenu=', 'Energy', -1, 'energy', '', '', 2, 10); insert into `llx_menu` (`rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values (11__+MAX_llx_menu__, 'auguria', 'top', 'shop', '', 0, '/boutique/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 11); insert into `llx_menu` (`rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values (12__+MAX_llx_menu__, 'auguria', 'top', 'shop', '', 0, '/oscommerce_ws/index.php?mainmenu=shop&leftmenu=', 'OSCommerce', -1, 'shop', '', '', 0, 12); +insert into `llx_menu` (`rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values (14__+MAX_llx_menu__, 'auguria', 'top', 'cashdesk', '', 0, '/cashdesk/index.php?mainmenu=cashdesk&leftmenu=', 'CashDesk', -1, 'cashdesk', '', '', 2, 13); insert into `llx_menu` (`rowid`, `menu_handler`, `type`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values (13__+MAX_llx_menu__, 'auguria', 'top', 'members', '', 0, '/adherents/index.php?mainmenu=members&leftmenu=', 'Members', -1, 'members', '', '', 2, 15); insert into `llx_menu` (`menu_handler`, `type`, `rowid`, `mainmenu`, `leftmenu`, `fk_menu`, `url`, `titre`, `level`, `langs`, perms, `target`, `user`, position) values ('auguria', 'left', 100__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/admin/index.php?leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 0); @@ -355,6 +356,7 @@ insert into `llx_menu_constraint` (`rowid`, `action`) values (68, '$leftmenu=="c insert into `llx_menu_constraint` (`rowid`, `action`) values (69, '$leftmenu=="bank"'); insert into `llx_menu_constraint` (`rowid`, `action`) values (70, '$leftmenu=="suppliers_bills"'); insert into `llx_menu_constraint` (`rowid`, `action`) values (71, '$leftmenu=="customers_bills"'); +insert into `llx_menu_constraint` (`rowid`, `action`) values (72, '$conf->cashdesk->enabled'); -- @@ -580,4 +582,5 @@ insert into `llx_menu_const` (`fk_menu`, `fk_constraint`) values (10__+MAX_llx_m insert into `llx_menu_const` (`fk_menu`, `fk_constraint`) values (11__+MAX_llx_menu__, 38); insert into `llx_menu_const` (`fk_menu`, `fk_constraint`) values (12__+MAX_llx_menu__, 39); insert into `llx_menu_const` (`fk_menu`, `fk_constraint`) values (13__+MAX_llx_menu__, 31); +insert into `llx_menu_const` (`fk_menu`, `fk_constraint`) values (14__+MAX_llx_menu__, 72); diff --git a/htdocs/includes/modules/modCashDesk.class.php b/htdocs/includes/modules/modCashDesk.class.php index f83751917df..2d6f5fdadd4 100644 --- a/htdocs/includes/modules/modCashDesk.class.php +++ b/htdocs/includes/modules/modCashDesk.class.php @@ -14,13 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * $Id$ */ /** \defgroup category Module categorie \brief Module pour gérer les catégories + \version $Id$ */ /**