From ff7d71c5b35a47399208023dc274c5660c1cb579 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Fri, 1 Jun 2012 11:12:39 +0000 Subject: [PATCH] 2012-06-01 Juan Manuel Ramon * godmode/massive/massive_edit_modules.php: Fixed group recursion checkbox in massive module edition. Merged from branches. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6400 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/godmode/massive/massive_edit_modules.php | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index a57aa16163..04999b86fc 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2012-06-01 Juan Manuel Ramon + + * godmode/massive/massive_edit_modules.php: Fixed group recursion + checkbox in massive module edition. + + Merged from branches. + 2012-06-01 Sergio Martin * godmode/massive/massive_edit_modules.php: Added units to diff --git a/pandora_console/godmode/massive/massive_edit_modules.php b/pandora_console/godmode/massive/massive_edit_modules.php index d9013589c8..1d0b7bc49d 100644 --- a/pandora_console/godmode/massive/massive_edit_modules.php +++ b/pandora_console/godmode/massive/massive_edit_modules.php @@ -399,6 +399,8 @@ $table->data['edit5'][3] = html_print_input_password ('plugin_pass', '', '', 15, // Export target $table->data['edit6'][0] = __('Export target'); $targets2 = db_get_all_rows_sql ("SELECT id, name FROM tserver_export ORDER by name"); +if ($targets2 === false) + $targets2 = array(); $targets = array_merge(array(0 => __('None')), $targets2 ); $table->data['edit6'][1] = html_print_select ($targets, 'id_export', '','', __('No change'), '', true, false, false); $table->data['edit6'][2] = __('Unit'); @@ -540,9 +542,14 @@ $(document).ready (function () { } } else if(this.id == "checkbox-recursion"){ + $("#checkbox-force_group").attr("checked", false); $("#groups_select").trigger("change"); } else { + if (this.id == "checkbox-force_group") { + $("#checkbox-recursion").attr("checked", false); + } + if(this.checked) { $(".select_agents_row_2").css('display', 'none'); $("tr#delete_table-edit1, tr#delete_table-edit2, tr#delete_table-edit3, tr#delete_table-edit35, tr#delete_table-edit4, tr#delete_table-edit5, tr#delete_table-edit6, tr#delete_table-edit7, tr#delete_table-edit8").show (); @@ -585,7 +592,7 @@ $(document).ready (function () { $("#groups_select").change ( function () { - $('input[type=checkbox]').attr('checked', false); + if (this.value < 0) { clean_lists(); $(".select_agents_row_2").css('display', 'none');