diff --git a/extras/build_vars.sh b/extras/build_vars.sh index 85e4e61451..29d166b065 100644 --- a/extras/build_vars.sh +++ b/extras/build_vars.sh @@ -1,10 +1,10 @@ #!/bin/bash -CODEHOME=/root/code/pandora/trunk -CODEHOME_ENT=/root/code/artica/code -PANDHOME_ENT=$CODEHOME_ENT/pandora/trunk +CODEHOME=/root/code/pandorafms +CODEHOME_ENT=/root/code/pandora_enterprise +PANDHOME_ENT=$CODEHOME_ENT RPMHOME=/usr/src/packages VERSION=$(grep 'my $pandora_version =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') BUILD=$(grep 'my $pandora_build =' $CODEHOME/pandora_server/lib/PandoraFMS/Config.pm | awk '{print substr($4, 2, length($4) - 3)}') X86_64=`uname -m | grep x86_64` CONSOLEHOME=$CODEHOME/pandora_console -CONSOLEHOME_ENT=$PANDHOME_ENT/pandora_console +CONSOLEHOME_ENT=$CODEHOME_ENT/pandora_console diff --git a/pandora_console/godmode/snmpconsole/snmp_alert.php b/pandora_console/godmode/snmpconsole/snmp_alert.php index 0a7fdde0b0..a112180f26 100644 --- a/pandora_console/godmode/snmpconsole/snmp_alert.php +++ b/pandora_console/godmode/snmpconsole/snmp_alert.php @@ -997,7 +997,7 @@ else { foreach ($other_actions as $action) { $data[1] .= ''; $data[1] .= ''. alerts_get_alert_action_name ($action["alert_type"]).''; - $data[1] .= ' ' . + $data[1] .= ' ' . html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . ' '; $data[1] .= ''; } @@ -1026,7 +1026,7 @@ else { '' . html_print_image('images/add.png', true, array('title' => __("Add action"))) . '' . - '' . + '' . html_print_image("images/cross.png", true, array("border" => '0', "alt" => __('Delete'))) . ''; @@ -1233,6 +1233,13 @@ $(document).ready (function () { // Charge the fields of the action $("#alert_type").trigger('change'); + + $("#submit-delete_button").click (function () { + confirmation = confirm(""); + if (!confirmation) { + return; + } + }); });