From fb33ea796c7ae3878d40de4d949a5b01c6bccd9c Mon Sep 17 00:00:00 2001 From: vgilc Date: Thu, 8 May 2014 10:41:25 +0000 Subject: [PATCH] 2014-05-08 Vanessa Gil * godmode/servers/plugin.php: Removed 'max. retries'. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9894 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 4 ++++ pandora_console/godmode/servers/plugin.php | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 521409aea9..ca25f13316 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,7 @@ +2014-05-08 Vanessa Gil + + * godmode/servers/plugin.php: Removed 'max. retries'. + 2014-05-08 Koichiro KIKUCHI * godmode/agentes/agent_wizard.snmp_interfaces_explorer.php: diff --git a/pandora_console/godmode/servers/plugin.php b/pandora_console/godmode/servers/plugin.php index 727aa8363a..307c4c24c8 100644 --- a/pandora_console/godmode/servers/plugin.php +++ b/pandora_console/godmode/servers/plugin.php @@ -192,8 +192,7 @@ if (($create != "") OR ($view != "")) { $data[0] = __('Max. timeout').ui_print_help_tip (__('This value only will be applied if is minor than the server general configuration plugin timeout').'.

'.__('If you set a 0 seconds timeout, the server plugin timeout will be used'), true); $data[1] = html_print_extended_select_for_time ('form_max_timeout', $form_max_timeout, '', '', '0', false, true); - $data[2] = __('Max. retries'); - $data[3] = ''; + $table->data['plugin_timeout'] = $data; $data = array(); @@ -401,7 +400,6 @@ else { $plugin_name = get_parameter ("form_name", ""); $plugin_description = get_parameter ("form_description", ""); $plugin_max_timeout = get_parameter ("form_max_timeout", ""); - $plugin_max_retries = get_parameter ("form_max_retries", ""); $plugin_execute = get_parameter ("form_execute", ""); $plugin_plugin_type = get_parameter ("form_plugin_type", "0"); $parameters = get_parameter ("form_parameters", ""); @@ -435,7 +433,6 @@ else { 'name' => $plugin_name, 'description' => $plugin_description, 'max_timeout' => $plugin_max_timeout, - 'max_retries' => $plugin_max_retries, 'execute' => $plugin_execute, 'plugin_type' => $plugin_plugin_type, 'parameters' => $parameters, @@ -458,7 +455,6 @@ else { $plugin_name = get_parameter ("form_name", ""); $plugin_description = get_parameter ("form_description", ""); $plugin_max_timeout = get_parameter ("form_max_timeout", ""); - $plugin_max_retries = get_parameter ("form_max_retries", ""); $plugin_execute = get_parameter ("form_execute", ""); $plugin_plugin_type = get_parameter ("form_plugin_type", "0"); $plugin_parameters = get_parameter ("form_parameters", ""); @@ -491,7 +487,6 @@ else { 'name' => $plugin_name, 'description' => $plugin_description, 'max_timeout' => $plugin_max_timeout, - 'max_retries' => $plugin_max_retries, 'execute' => $plugin_execute, 'plugin_type' => $plugin_plugin_type, 'parameters' => $plugin_parameters,