[Noalyss-commit] [noalyss] 10/21: Task #1151 - Amélioration configuration des menus #1151 show only menu and no printing for dependency

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 507bcc6f1f7880edeacd4eb445698e23ff7758b2
Author: Dany De Bontridder <address@hidden>
Date:   Sat Aug 15 09:58:59 2015 +0200

    Task #1151 - Amélioration configuration des menus
    #1151 show only menu and no printing for dependency
---
 include/ajax_add_menu.php |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/ajax_add_menu.php b/include/ajax_add_menu.php
index 61a35b1..333810a 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);
 <?php 
 echo HtmlInput::submit('add_menu',_("Valider"));
 echo '</form>';
+return;
 }
+
+// for printing menu (export CSV or PDF)
 if ($type=='pr')
 {
 
@@ -143,8 +148,9 @@ $me_code->value=$ame_code;
 
 </table>
 <?php 
-echo HtmlInput::submit('add_impress',_("Valider"));
-echo '</form>';
+    echo HtmlInput::submit('add_impress',_("Valider"));
+    echo '</form>';
+    return;
 }
 
 ?>