From c45e29ac4e560c4b9ccba538fab8338171de63d6 Mon Sep 17 00:00:00 2001 From: Esteban Sanchez Date: Wed, 22 Apr 2009 10:46:05 +0000 Subject: [PATCH] =?UTF-8?q?2009-04-22=20=20Esteban=20S=C3=A1nchez=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * pandoradb_data.sql: Use 3.0 for version number * include/javascript/jquery.pandora.controls.js: Duplicated pandoraSelectGroup renamed to pandoraSelectGroupAgent. * godmode/agentes/massive_config.php, godmode/agentes/massive_delete_agents.php, godmode/agentes/massive_delete_alerts.php, godmode/agentes/massive_delete_modules.php, godmode/alerts/alert_compounds.php, godmode/alerts/alert_list.php, godmode/reporting/reporting_builder.php: pandoraSelectGroup renamed to pandoraSelectGroupAgent. * godmode/agentes/modificar_agente.php: Tiny changes in remote agent config link. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1644 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 59 ++++++++++++++++++- .../godmode/agentes/massive_config.php | 4 +- .../godmode/agentes/massive_delete_agents.php | 2 +- .../godmode/agentes/massive_delete_alerts.php | 2 +- .../agentes/massive_delete_modules.php | 2 +- .../godmode/agentes/modificar_agente.php | 7 +-- .../godmode/alerts/alert_compounds.php | 2 +- pandora_console/godmode/alerts/alert_list.php | 2 +- .../godmode/reporting/reporting_builder.php | 2 +- .../javascript/jquery.pandora.controls.js | 12 ++-- pandora_console/pandoradb_data.sql | 4 +- 11 files changed, 77 insertions(+), 21 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 727c617fc7..c267fa9826 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,21 @@ +2009-04-22 Esteban Sánchez + + * pandoradb_data.sql: Use 3.0 for version number + + * include/javascript/jquery.pandora.controls.js: Duplicated + pandoraSelectGroup renamed to pandoraSelectGroupAgent. + + * godmode/agentes/massive_config.php, + godmode/agentes/massive_delete_agents.php, + godmode/agentes/massive_delete_alerts.php, + godmode/agentes/massive_delete_modules.php, + godmode/alerts/alert_compounds.php, godmode/alerts/alert_list.php, + godmode/reporting/reporting_builder.php: pandoraSelectGroup renamed to + pandoraSelectGroupAgent. + + * godmode/agentes/modificar_agente.php: Tiny changes in remote agent config + link. + 2009-04-22 Manuel Arostegui * install.php: Fixed bug #2777317 @@ -76,8 +94,47 @@ godmode/agentes/module_manager.php: Some fixes to allow form reutilization. + * include/javascript/jquery.pandora.controls.js: Fixed a typo. Added + pandoraSelectGroup control. + + * include/javascript/jquery.pandora.js: Separate between auto executed code + and document ready function. + + * include/javascript/pandora_modules.js: Added to repository. Functions to + use on module editors. + + * include/functions_agents.php: Added get_agents(). + + * include/functions_db.php: Added get_user_first_group(). Changed + user_access_to_agent() parameters order. + + * include/functions_reporting.php: Style corrections. + + * include/functions_ui.php: Added doc to print_status_image(). Added + print_ui_agents_list() to print a list of agents with a search form and + a lot of configuration options easily. + + * include/functions_ui_renders.php: Added to repository. New API for + renders on UI components. + + * operation/agentes/estado_agente.php: Make table wider. + * godmode/reporting/reporting_builder.php: Replaced exit with return. Use - pandoraSelectGroup() control. + pandoraSelectGroup control. + + * godmode/servers/manage_recontask_form.php: Style corrections to fit + Pandora styles. + + * godmode/servers/modificar_server.php: Removed a notice from a typo. + + * godmode/setup/setup.php: Fixed table data indexes. Removed javascript + code from visual setup. + + * godmode/setup/setup_visuals.php: Some strings changed. Style correction. + + * godmode/menu.php: Added policies enterprise menu option. + + * images/policies.png: Added to repository. * godmode/agentes/modificar_agente.php: Style correction by using pandora functions. diff --git a/pandora_console/godmode/agentes/massive_config.php b/pandora_console/godmode/agentes/massive_config.php index ba19745820..f93ecb8440 100644 --- a/pandora_console/godmode/agentes/massive_config.php +++ b/pandora_console/godmode/agentes/massive_config.php @@ -169,12 +169,12 @@ require_jquery_file ('pandora.controls'); /* $(document).ready (function () { - $("#id_group").pandoraSelectGroup ({ + $("#id_group").pandoraSelectGroupAgent ({ agentSelect: "select#id_agents" }); }); diff --git a/pandora_console/godmode/agentes/massive_delete_alerts.php b/pandora_console/godmode/agentes/massive_delete_alerts.php index 847e8910d8..9a85d9a966 100644 --- a/pandora_console/godmode/agentes/massive_delete_alerts.php +++ b/pandora_console/godmode/agentes/massive_delete_alerts.php @@ -128,7 +128,7 @@ require_jquery_file ('pandora.controls'); diff --git a/pandora_console/godmode/alerts/alert_list.php b/pandora_console/godmode/alerts/alert_list.php index 13344ead89..272a8cdd36 100644 --- a/pandora_console/godmode/alerts/alert_list.php +++ b/pandora_console/godmode/alerts/alert_list.php @@ -414,7 +414,7 @@ require_jquery_file ('pandora.controls'); /* - $("#id_group").pandoraSelectGroup ({ + $("#id_group").pandoraSelectGroupAgent ({ callbackBefore: function () { $select = $("#id_agent_module").disable (); $select.siblings ("span#latest_value").hide (); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 89743e4479..97eccfadda 100644 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -627,7 +627,7 @@ function report_type_changed () { $(document).ready (function () { $('#id_agent').change (agent_changed); $('#type').change (report_type_changed); - $('#report_id_group').pandoraSelectGroup (); + $('#report_id_group').pandoraSelectGroupAgent (); }); /* ]]> */ diff --git a/pandora_console/include/javascript/jquery.pandora.controls.js b/pandora_console/include/javascript/jquery.pandora.controls.js index 727afb2344..f0a17c00cf 100644 --- a/pandora_console/include/javascript/jquery.pandora.controls.js +++ b/pandora_console/include/javascript/jquery.pandora.controls.js @@ -4,7 +4,7 @@ }; $.extend ({ - pandoraSelectGroup: new function() { + pandoraSelectGroupAgent: new function() { this.defaults = { agentSelect: "select#id_agent", loading: "#agent_loading", @@ -20,7 +20,7 @@ return this.each (function() { this.config = {}; - this.config = $.extend (this.config, $.pandoraSelectGroup.defaults, settings); + this.config = $.extend (this.config, $.pandoraSelectGroupAgent.defaults, settings); var config = this.config; $(this).change (function () { @@ -207,7 +207,7 @@ }); $.extend ({ - pandoraSelectGroup: new function() { + pandoraSelectGroupIcon: new function() { this.defaults = { alertSelect: "select#id_group", spanPreview: "#group_preview", @@ -218,7 +218,7 @@ this.construct = function (settings) { return this.each (function() { this.config = {}; - this.config = $.extend (this.config, $.pandoraSelectGroup.defaults, settings); + this.config = $.extend (this.config, $.pandoraSelectGroupIcon.defaults, settings); var config = this.config; @@ -249,10 +249,10 @@ }); $.fn.extend({ - pandoraSelectGroup: $.pandoraSelectGroup.construct, + pandoraSelectGroupAgent: $.pandoraSelectGroupAgent.construct, pandoraSelectAgentModule: $.pandoraSelectAgentModule.construct, pandoraSelectAgentAlert: $.pandoraSelectAgentAlert.construct, pandoraSelectOS: $.pandoraSelectOS.construct, - pandoraSelectGroup: $.pandoraSelectGroup.construct + pandoraSelectGroupIcon: $.pandoraSelectGroupIcon.construct }); }) (jQuery); diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index faf6bcc61c..aa399b375a 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -14,7 +14,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Database Data for Pandora FMS 2.0 +-- Database Data for Pandora FMS 3.0 -- PLEASE NO NOT USE MULTILINE COMMENTS -- Because Pandora Installer don't understand them @@ -243,7 +243,7 @@ INSERT INTO `tusuario_perfil` VALUES (1,'admin',5,1,'admin'); INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1); -INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 2.0!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()); +INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 3.0!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()); INSERT INTO tmodule VALUES (1,'Agent module'); INSERT INTO tmodule VALUES (2,'Network module');