From 6176401c55fb816db1f390f70f7e3b74695b7c4e Mon Sep 17 00:00:00 2001 From: zarzuelo Date: Tue, 24 Jul 2012 11:55:02 +0000 Subject: [PATCH] 2012-07-24 Sergio Martin * extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added missed field to migrate scripts * godmode/agentes/module_manager_editor.php godmode/modules/manage_network_components_form.php godmode/modules/manage_network_components_form_plugin.php: Improve code of dinamic macros and encapsulate it on enterprise side git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6802 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 13 ++ .../pandoradb_migrate_4.0.x_to_5.0.mysql.sql | 1 + .../pandoradb_migrate_4.0.x_to_5.0.oracle.sql | 1 + ...doradb_migrate_4.0.x_to_5.0.postgreSQL.sql | 1 + .../godmode/agentes/module_manager_editor.php | 6 +- .../manage_network_components_form.php | 101 +-------------- .../manage_network_components_form_plugin.php | 118 +++++++++--------- 7 files changed, 82 insertions(+), 159 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 1404ed13e3..90461063fc 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,16 @@ +2012-07-24 Sergio Martin + + * extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql + extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql + extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added + missed field to migrate scripts + + * godmode/agentes/module_manager_editor.php + godmode/modules/manage_network_components_form.php + godmode/modules/manage_network_components_form_plugin.php: + Improve code of dinamic macros and encapsulate it on enterprise + side + 2012-07-24 Dario Rodriguez * operation/tree.php: Added comment to insert tag based diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql index 07bfb707b0..92516c92c7 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql @@ -281,6 +281,7 @@ ALTER TABLE tnetwork_component ADD `macros` text; -- ----------------------------------------------------- ALTER TABLE tagente_modulo ADD `wizard_level` enum('basic','advanced','custom','nowizard') default 'nowizard'; +ALTER TABLE tagente_modulo ADD `macros` text; -- ----------------------------------------------------- -- Table `tusuario` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql index 7fa3619169..70296d344a 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql @@ -286,6 +286,7 @@ ALTER TABLE tnetwork_component ADD (macros CLOB default ''); ALTER TABLE tagente_modulo ADD (wizard_level VARCHAR2(100) default 'nowizard' NOT NULL); ALTER TABLE tagente_modulo ADD CONSTRAINT t_agente_modulo_wizard_level_cons CHECK (wizard_level IN ('basic','advanced','custom','nowizard')); +ALTER TABLE tagente_modulo ADD (macros CLOB default ''); -- ----------------------------------------------------- -- Table `tusuario` diff --git a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql index 0e92a8b0d8..71d9034482 100644 --- a/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql +++ b/pandora_console/extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql @@ -274,6 +274,7 @@ ALTER TABLE "tnetwork_component" ADD COLUMN "macros" TEXT default ''; CREATE TYPE type_tagente_modulo_wizard_level AS ENUM ('basic','advanced','custom','nowizard'); ALTER TABLE "tagente_modulo" ADD COLUMN "wizard_level" type_tagente_modulo_wizard_level default 'nowizard'; +ALTER TABLE "tagente_modulo" ADD COLUMN "macros" TEXT default ''; -- ----------------------------------------------------- -- Table `tusuario` diff --git a/pandora_console/godmode/agentes/module_manager_editor.php b/pandora_console/godmode/agentes/module_manager_editor.php index ac16428b8e..7c245a7f23 100644 --- a/pandora_console/godmode/agentes/module_manager_editor.php +++ b/pandora_console/godmode/agentes/module_manager_editor.php @@ -40,6 +40,7 @@ if (is_ajax ()) { $components = network_components_get_network_components ($id_module_component, array ('id_group' => $id_module_group, + 'only_metaconsole' => 0, 'order' => 'name ASC'), array ('id_nc', 'name')); @@ -51,7 +52,10 @@ if (is_ajax ()) { require_once ($config['homedir'].'/'.ENTERPRISE_DIR.'/include/functions_local_components.php'); $id_module_group = (int) get_parameter ('id_module_component_group'); - $localComponents = local_components_get_local_components(array('id_network_component_group' => $id_module_group), array('id', 'name')); + $localComponents = local_components_get_local_components( + array('id_network_component_group' => $id_module_group, + 'only_metaconsole' => 0), + array('id', 'name')); echo json_encode($localComponents); return; diff --git a/pandora_console/godmode/modules/manage_network_components_form.php b/pandora_console/godmode/modules/manage_network_components_form.php index 57056d956b..e9890902f0 100644 --- a/pandora_console/godmode/modules/manage_network_components_form.php +++ b/pandora_console/godmode/modules/manage_network_components_form.php @@ -168,6 +168,8 @@ else { } echo ''; echo ''; + +ui_require_javascript_file_enterprise('pandora_local_components'); ?> diff --git a/pandora_console/godmode/modules/manage_network_components_form_plugin.php b/pandora_console/godmode/modules/manage_network_components_form_plugin.php index 0806c11ab8..c6eb73a391 100644 --- a/pandora_console/godmode/modules/manage_network_components_form_plugin.php +++ b/pandora_console/godmode/modules/manage_network_components_form_plugin.php @@ -52,77 +52,77 @@ $data[3] = html_print_input_text ('post_process', $post_process, '', 12, 25, tru push_table_row ($data, 'plugin_3'); - -$data = array (); -$data[0] = __('Plugin macros'); -$data[0] .= ui_print_help_icon ('plugin_macros', true); -$data[1] = $data[2] = $data[3] = ''; - -push_table_row ($data, 'plugin_4'); - -$macros = json_decode($macros,true); -// The next row number is plugin_5 -$next_name_number = 5; -$i = 1; -while(1) { - // Always print at least one macro - if((!isset($macros[$i]) || $macros[$i]['desc'] == '') && $i > 1) { - break; - } - $macro_desc_name = 'field'.$i.'_desc'; - $macro_desc_value = ''; - $macro_help_name = 'field'.$i.'_help'; - $macro_help_value = ''; - $macro_value_name = 'field'.$i.'_value'; - $macro_value_value = ''; - $macro_name_name = 'field'.$i.'_macro'; - $macro_name = '_field'.$i.'_'; - - if(isset($macros[$i]['desc'])) { - $macro_desc_value = $macros[$i]['desc']; - } - - if(isset($macros[$i]['help'])) { - $macro_help_value = $macros[$i]['help']; - } - - if(isset($macros[$i]['value'])) { - $macro_value_value = $macros[$i]['value']; - } - +// Dynamic macros for enterprise version +if(enterprise_installed()) { $data = array (); - $data[0] = sprintf(__('Macro %s description'),$macro_name); - $data[0] .= ui_print_help_tip (sprintf(__('Field that will replace the macro %s in Plug-in parameters'),$macro_name), true); - $data[0] .= html_print_input_hidden($macro_name_name, $macro_name, true); - $data[1] = html_print_input_text ($macro_desc_name, $macro_desc_value, '', 30, 255, true); - $data[2] = sprintf(__('Macro %s default value'),$macro_name); - $data[2] .= ui_print_help_tip (sprintf(__('Default value for the macro %s'),$macro_name), true); - $data[3] = html_print_input_text ($macro_value_name, $macro_value_value, '', 30, 255, true); + $data[0] = __('Plugin macros'); + $data[0] .= ui_print_help_icon ('plugin', true); + $data[1] = $data[2] = $data[3] = ''; - push_table_row ($data, 'plugin_'.$next_name_number); - $next_name_number++; - - $table->colspan['plugin_'.$next_name_number][1] = 2; + push_table_row ($data, 'plugin_4'); - $data = array (); - $data[0] = sprintf(__('Macro %s help'),$macro_name); - $data[0] .= ui_print_help_tip (sprintf(__('Help that will appear near %s'),$macro_name), true); - $data[1] = html_print_input_text ($macro_help_name, $macro_help_value, '', 100, 255, true); + $macros = json_decode($macros,true); + // The next row number is plugin_5 + $next_name_number = 5; + $i = 1; + while(1) { + // Always print at least one macro + if((!isset($macros[$i]) || $macros[$i]['desc'] == '') && $i > 1) { + break; + } + $macro_desc_name = 'field'.$i.'_desc'; + $macro_desc_value = ''; + $macro_help_name = 'field'.$i.'_help'; + $macro_help_value = ''; + $macro_value_name = 'field'.$i.'_value'; + $macro_value_value = ''; + $macro_name_name = 'field'.$i.'_macro'; + $macro_name = '_field'.$i.'_'; + + if(isset($macros[$i]['desc'])) { + $macro_desc_value = $macros[$i]['desc']; + } + + if(isset($macros[$i]['help'])) { + $macro_help_value = $macros[$i]['help']; + } + + if(isset($macros[$i]['value'])) { + $macro_value_value = $macros[$i]['value']; + } + + $data = array (); + $data[0] = sprintf(__('Macro %s description'),$macro_name); + $data[0] .= html_print_input_hidden($macro_name_name, $macro_name, true); + $data[1] = html_print_input_text ($macro_desc_name, $macro_desc_value, '', 30, 255, true); + $data[2] = sprintf(__('Macro %s default value'),$macro_name); + $data[3] = html_print_input_text ($macro_value_name, $macro_value_value, '', 30, 255, true); - push_table_row ($data, 'plugin_'.$next_name_number); - $next_name_number++; - $i++; -} + push_table_row ($data, 'plugin_'.$next_name_number); + $next_name_number++; + + $table->colspan['plugin_'.$next_name_number][1] = 2; + + $data = array (); + $data[0] = sprintf(__('Macro %s help'),$macro_name); + $data[1] = html_print_input_text ($macro_help_name, $macro_help_value, '', 100, 255, true); + + push_table_row ($data, 'plugin_'.$next_name_number); + $next_name_number++; + $i++; + } $table->colspan['plugin_n'][2] = 2; $data = array (); $data[0] = ''; - $data[1] = __('Add macro').' '.html_print_image('images/add.png',true).''; + $data[1] = __('Add macro').' '.html_print_image('images/add.png',true).''; $data[1] .= ''; $data[1] .= ''; - $data[2] = ''; + $data[2] = ''; push_table_row ($data, 'plugin_n'); +} + ?>