From 507bcc6f1f7880edeacd4eb445698e23ff7758b2 Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 15 Aug 2015 09:58:59 +0200 Subject: [PATCH] =?UTF-8?q?Task=20#1151=20-=20Am=C3=A9lioration=20configur?= =?UTF-8?q?ation=20des=20menus=20#1151=20show=20only=20menu=20and=20no=20p?= =?UTF-8?q?rinting=20for=20dependency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/ajax_add_menu.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/include/ajax_add_menu.php b/include/ajax_add_menu.php index 61a35b1a7..333810ace 100644 --- a/include/ajax_add_menu.php +++ b/include/ajax_add_menu.php @@ -30,6 +30,7 @@ if ($type == 'XX') { throw new Exception('invalid call'); return; } +// if type == menu the if ( $type=='me') { $ame_code_dep=$cn->make_array(" @@ -47,7 +48,6 @@ $ame_code_dep=$cn->make_array(" $ame_code=$cn->make_array(" select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description,'') ||'('|| case when me_type='SP' then 'Special' - when me_type='PR' then 'Impression' when me_type='PL' then 'Plugin' when me_type='ME' and me_file is null and me_javascript is null and me_url is null then 'Module - Menu principal' when me_type='ME' then 'Menu' @@ -56,6 +56,8 @@ select me_code,me_code||' '||coalesce(me_menu,'')||' '||coalesce(me_description, end||')' from menu_ref + where + me_type<>'PR' order by 1 "); @@ -104,7 +106,10 @@ echo HtmlInput::title_box(_("Nouveau menu"), $ctl); '; +return; } + +// for printing menu (export CSV or PDF) if ($type=='pr') { @@ -143,8 +148,9 @@ $me_code->value=$ame_code; '; + echo HtmlInput::submit('add_impress',_("Valider")); + echo ''; + return; } ?>