From 967e3471a718e18e8022a526519b1397859967e2 Mon Sep 17 00:00:00 2001 From: Nate Date: Thu, 27 Feb 2020 09:27:11 -0700 Subject: [PATCH] IVR Menus: Dynamic delete button action. --- app/ivr_menus/ivr_menu_edit.php | 41 +++++++++++++-------------------- themes/default/template.php | 11 +++++++++ 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php index 3bef5ff91f..72d9ad1ca5 100644 --- a/app/ivr_menus/ivr_menu_edit.php +++ b/app/ivr_menus/ivr_menu_edit.php @@ -79,9 +79,9 @@ if (count($_POST) > 0) { //process the http post data by submitted action - if ($_POST['action'] != '' && is_uuid($ivr_menu_uuid)) { + if ($_POST['action'] != '' && is_uuid($_POST['ivr_menu_uuid'])) { $array[0]['checked'] = 'true'; - $array[0]['uuid'] = $ivr_menu_uuid; + $array[0]['uuid'] = $_POST['ivr_menu_uuid']; switch ($_POST['action']) { case 'copy': @@ -554,18 +554,10 @@ //show the content echo ""; echo "
\n"; @@ -580,7 +572,7 @@ unset($button_margin); } if (permission_exists('ivr_menu_delete') && $action == "update") { - echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'action','value'=>'delete','style'=>$button_margin,'onclick'=>"if (!confirm('".$text['confirm-delete']."')) { this.blur(); return false; }"]); + echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'action','value'=>'delete','style'=>$button_margin,'onclick'=>"if (!confirm('".$text['confirm-delete']."')) { this.blur(); return false; }"]); unset($button_margin); } echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'style'=>'margin-left: 15px']); @@ -938,8 +930,8 @@ echo " ".$text['label-destination']."\n"; echo " ".$text['label-order']."\n"; echo " ".$text['label-description']."\n"; - if ($show_option_delete) { - echo " ".$text['label-delete']."\n"; + if ($show_option_delete && permission_exists('ivr_menu_option_delete')) { + echo " ".$text['label-delete']."\n"; } echo " \n"; if (is_array($ivr_menu_options)) { @@ -986,15 +978,14 @@ echo " \n"; echo "\n"; - echo ""; - if (is_uuid($field['ivr_menu_option_uuid'])) { - echo " \n"; - echo " \n"; + if ($show_option_delete && permission_exists('ivr_menu_option_delete')) { + echo ""; + if (is_uuid($field['ivr_menu_option_uuid'])) { + echo " \n"; + echo " \n"; + } + echo "\n"; } - else { - echo " \n"; - } - echo "\n"; echo "\n"; diff --git a/themes/default/template.php b/themes/default/template.php index b69dabdfd4..adcc76f30c 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -486,6 +486,17 @@ echo "