From 7a65a5670e8815db8b331d5ab0ba756846912a92 Mon Sep 17 00:00:00 2001 From: esanchezm Date: Mon, 23 Feb 2009 16:23:58 +0000 Subject: [PATCH] 2009-02-23 Esteban Sanchez * include/javascript/jquery.pandora.controls.js: Changed agent and module selector to allow any kind of object instead of only an id. Tiny changes to allow multiple elements in a page. * include/functions_html.php: Added a separator for duplicated select elements (it's useful sometimes to get this number with javascript and using a separator helps) * godmode/agentes/manage_delete.php, godmode/agentes/manage_config.php: Fixed agent and group selector to fits changes in pandora.controls.js. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1475 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 14 +++++++++ .../godmode/agentes/manage_config.php | 8 ++--- .../godmode/agentes/manage_delete.php | 2 +- pandora_console/include/functions_html.php | 2 +- .../javascript/jquery.pandora.controls.js | 31 ++++++++++--------- 5 files changed, 37 insertions(+), 20 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b628d5f8e4..8afa55f462 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,17 @@ +2009-02-23 Esteban Sanchez + + * include/javascript/jquery.pandora.controls.js: Changed agent and + module selector to allow any kind of object instead of only an id. + Tiny changes to allow multiple elements in a page. + + * include/functions_html.php: Added a separator for duplicated select + elements (it's useful sometimes to get this number with javascript and + using a separator helps) + + * godmode/agentes/manage_delete.php, + godmode/agentes/manage_config.php: Fixed agent and group selector to + fits changes in pandora.controls.js. + 2009-02-23 Esteban Sanchez * include/functions_html.php: Fixed id counter on print_select. diff --git a/pandora_console/godmode/agentes/manage_config.php b/pandora_console/godmode/agentes/manage_config.php index 4c4766266b..634f42759b 100644 --- a/pandora_console/godmode/agentes/manage_config.php +++ b/pandora_console/godmode/agentes/manage_config.php @@ -238,13 +238,13 @@ require_jquery_file ('pandora.controls'); diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php index 947c1c20f3..d240a6d0f4 100644 --- a/pandora_console/include/functions_html.php +++ b/pandora_console/include/functions_html.php @@ -44,7 +44,7 @@ function print_select ($fields, $name, $selected = '', $script = '', $nothing = //If duplicate names exist, it will start numbering. Otherwise it won't (for backwards compatibility) if (isset ($idcounter[$name])) { $idcounter[$name]++; - $name = $name.$idcounter[$name]; + $name = $name.'-'.$idcounter[$name]; } else { $idcounter[$name] = 0; } diff --git a/pandora_console/include/javascript/jquery.pandora.controls.js b/pandora_console/include/javascript/jquery.pandora.controls.js index 1196613cda..a62d2df676 100644 --- a/pandora_console/include/javascript/jquery.pandora.controls.js +++ b/pandora_console/include/javascript/jquery.pandora.controls.js @@ -6,8 +6,8 @@ $(document).ready (function () { $.extend ({ pandoraSelectGroup: new function() { this.defaults = { - agentSelectId: "id_agent", - loadingId: "agent_loading", + agentSelect: "select#id_agent", + loading: "#agent_loading", callbackBefore: dummyFunc, callbackPre: dummyFunc, callbackPost: dummyFunc, @@ -20,11 +20,12 @@ $(document).ready (function () { return this.each (function() { this.config = {}; - var config = $.extend (this.config, $.pandoraSelectGroup.defaults, settings); + this.config = $.extend (this.config, $.pandoraSelectGroup.defaults, settings); + var config = this.config; $(this).change (function () { - var $select = $("select#"+config.agentSelectId).disable (); - $("#"+config.loadingId).show (); + var $select = $(config.agentSelect).disable (); + $(config.loading).show (); $("option[value!=0]", $select).remove (); config.callbackBefore (this); @@ -40,9 +41,9 @@ $(document).ready (function () { .attr ("value", id) .html (value); config.callbackPost (id, value, option); - $("#"+config.agentSelectId).append (option); + $(config.agentSelect).append (option); }); - $("#"+config.loadingId).hide (); + $(config.loading).hide (); $select.enable (); config.callbackAfter (); }, @@ -57,8 +58,8 @@ $(document).ready (function () { $.extend ({ pandoraSelectAgent: new function() { this.defaults = { - moduleSelectId: "id_agent_module", - loadingId: "module_loading", + moduleSelect: "select#id_agent_module", + loading: "module_loading", callbackBefore: dummyFunc, callbackPre: dummyFunc, callbackPost: dummyFunc, @@ -71,11 +72,13 @@ $(document).ready (function () { return this.each (function() { this.config = {}; - var config = $.extend (this.config, $.pandoraSelectAgent.defaults, settings); + this.config = $.extend (this.config, $.pandoraSelectAgent.defaults, settings); + var config = this.config; + $(this).change (function () { - var $select = $("select#"+config.moduleSelectId).disable (); - $("#"+config.loadingId).show (); + var $select = $(config.moduleSelect).disable (); + $(config.loading).show (); $("option[value!=0]", $select).remove (); config.callbackBefore (this); @@ -91,9 +94,9 @@ $(document).ready (function () { .attr ("value", value['id_agente_modulo']) .html (html_entity_decode (value['nombre'])); config.callbackPost (i, value, option); - $("#"+config.moduleSelectId).append (option); + $(config.moduleSelect).append (option); }); - $("#"+config.loadingId).hide (); + $(config.loading).hide (); $select.enable (); config.callbackAfter (); },