tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>

Browse Source 
* 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
This commit is contained in:
juanmanuelr 2012-06-01 11:12:39 +00:00
parent f1c23d2c7c
commit ff7d71c5b3
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-06-01 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/massive/massive_edit_modules.php: Fixed group recursion
checkbox in massive module edition.
Merged from branches.
2012-06-01 Sergio Martin <sergio.martin@artica.es> 2012-06-01 Sergio Martin <sergio.martin@artica.es>
* godmode/massive/massive_edit_modules.php: Added units to * godmode/massive/massive_edit_modules.php: Added units to

9
pandora_console/godmode/massive/massive_edit_modules.php
View File

@ -399,6 +399,8 @@ $table->data['edit5'][3] = html_print_input_password ('plugin_pass', '', '', 15,
// Export target // Export target
$table->data['edit6'][0] = __('Export target'); $table->data['edit6'][0] = __('Export target');
$targets2 = db_get_all_rows_sql ("SELECT id, name FROM tserver_export ORDER by name"); $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 ); $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'][1] = html_print_select ($targets, 'id_export', '','', __('No change'), '', true, false, false);
$table->data['edit6'][2] = __('Unit'); $table->data['edit6'][2] = __('Unit');
@ -540,9 +542,14 @@ $(document).ready (function () {
} }
} }
else if(this.id == "checkbox-recursion"){ else if(this.id == "checkbox-recursion"){
$("#checkbox-force_group").attr("checked", false);
$("#groups_select").trigger("change"); $("#groups_select").trigger("change");
} }
else { else {
if (this.id == "checkbox-force_group") {
$("#checkbox-recursion").attr("checked", false);
}
if(this.checked) { if(this.checked) {
$(".select_agents_row_2").css('display', 'none'); $(".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 (); $("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 ( $("#groups_select").change (
function () { function () {
$('input[type=checkbox]').attr('checked', false);
if (this.value < 0) { if (this.value < 0) {
clean_lists(); clean_lists();
$(".select_agents_row_2").css('display', 'none'); $(".select_agents_row_2").css('display', 'none');