From 9bfa75acf25a21e8df4787967e263bc26887613c Mon Sep 17 00:00:00 2001 From: juanmanuelr <noreply@pandorafms.org> Date: Fri, 11 Nov 2011 08:28:34 +0000 Subject: [PATCH] 2011-11-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es> * godmode/massive/massive_enable_disable_alerts.php godmode/massive/massive_operations.php: Correct mistake from my last commit. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5127 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 6 +++++ .../massive/massive_enable_disable_alerts.php | 2 +- .../godmode/massive/massive_operations.php | 22 +++++-------------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4e5d91dc47..51296b4d61 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,9 @@ +2011-11-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es> + + * godmode/massive/massive_enable_disable_alerts.php + godmode/massive/massive_operations.php: Correct mistake from my last + commit. + 2011-11-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es> * godmode/massive/massive_add_alerts.php diff --git a/pandora_console/godmode/massive/massive_enable_disable_alerts.php b/pandora_console/godmode/massive/massive_enable_disable_alerts.php index 9939f25ee4..bec8ec3ae4 100644 --- a/pandora_console/godmode/massive/massive_enable_disable_alerts.php +++ b/pandora_console/godmode/massive/massive_enable_disable_alerts.php @@ -1,4 +1,4 @@ -F<?php +<?php // Pandora FMS - http://pandorafms.com // ================================================== diff --git a/pandora_console/godmode/massive/massive_operations.php b/pandora_console/godmode/massive/massive_operations.php index 93d5b318a0..65ba7806f9 100644 --- a/pandora_console/godmode/massive/massive_operations.php +++ b/pandora_console/godmode/massive/massive_operations.php @@ -174,11 +174,13 @@ $(document).ready (function (){ }); $('#form_edit').submit( function(){ - $("#loading").css("display", ""); + confirm = confirm(" <?php echo __('Are you sure?'); ?> "); + if (confirm) + $("#loading").css("display", ""); + else + return false; }); - - $('[id^=form]').submit( function(){ confirm = confirm(" <?php echo __('Are you sure?'); ?> "); if (confirm) @@ -187,23 +189,9 @@ $(document).ready (function (){ return false; }); -// $('[id^=submit-]').click( function(){ -// $("#loading").css("display", ""); -// }); - - - $("#loading").css("display", "none"); }); -// $("#loading").slideUp (); - - //$('[id^=submit]').click( function() { - // console.log("DERER"); - // $("#loading").show (); - //}); - - </script> <?php