tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-08-27 Miguel de Dios <miguel.dedios@artica.es> 

* index.php, include/javascript/pandora.js: fixed code style.
	
	* godmode/massive/massive_edit_modules.php: fixed the javascript
	that showed some rows before to select modules to edit.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8699 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-08-27 09:29:36 +00:00
parent 805ae2d670
commit c0cf75417c
4 changed files with 182 additions and 57 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 @@
2013-08-27 Miguel de Dios <miguel.dedios@artica.es>
* index.php, include/javascript/pandora.js: fixed code style.
* godmode/massive/massive_edit_modules.php: fixed the javascript
that showed some rows before to select modules to edit.
2013-08-26 Miguel de Dios <miguel.dedios@artica.es>
* pandoradb.data.postgreSQL.sql, pandoradb.data.oracle.sql,

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

@ -503,7 +503,21 @@ $(document).ready (function () {
$(".select_modules_row_2").css('display', '');
}
$("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, tr#delete_table-edit10, tr#delete_table-edit11, tr#delete_table-edit12").hide ();
$("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, " +
"tr#delete_table-edit81, " +
"tr#delete_table-edit82, " +
"tr#delete_table-edit9, " +
"tr#delete_table-edit10, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12").hide ();
if (this.value == '0') {
filter = '';
@ -535,10 +549,26 @@ $(document).ready (function () {
);
});
function show_form() {
$("td#delete_table-0-1, td#delete_table-edit1-1, td#delete_table-edit2-1").css ("width", "300px");
$("td#delete_table-0-1, " +
"td#delete_table-edit1-1, " +
"td#delete_table-edit2-1").css ("width", "300px");
$("#form_edit input[type=text]").attr ("value", "");
$("#form_edit input[type=checkbox]").not ("#checkbox-recursion").removeAttr ("checked");
$("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, tr#delete_table-edit10, tr#delete_table-edit11, tr#delete_table-edit12").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, " +
"tr#delete_table-edit81, " +
"tr#delete_table-edit82, " +
"tr#delete_table-edit9, " +
"tr#delete_table-edit10, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12").show ();
}
function clean_lists() {
@ -546,7 +576,24 @@ $(document).ready (function () {
$("#module_name").html('<?php echo __('None'); ?>');
$("#agents").html('<?php echo __('None'); ?>');
$("#module").html('<?php echo __('None'); ?>');
$("tr#delete_table-edit1, tr#delete_table-edit2, tr#delete_table-edit3, tr#delete_table-edit35, tr#delete_table-edit36, tr#delete_table-edit37, tr#delete_table-edit38, tr#delete_table-edit4, tr#delete_table-edit5, tr#delete_table-edit6, tr#delete_table-edit7, tr#delete_table-edit8, tr#delete_table-edit10, tr#delete_table-edit11, tr#delete_table-edit12").hide ();
$("tr#delete_table-edit1, " +
"tr#delete_table-edit2, " +
"tr#delete_table-edit3, " +
"tr#delete_table-edit35, " +
"tr#delete_table-edit36, " +
"tr#delete_table-edit37, " +
"tr#delete_table-edit38, " +
"tr#delete_table-edit4, " +
"tr#delete_table-edit5, " +
"tr#delete_table-edit6, " +
"tr#delete_table-edit7, " +
"tr#delete_table-edit8, " +
"tr#delete_table-edit81, " +
"tr#delete_table-edit82, " +
"tr#delete_table-edit9, " +
"tr#delete_table-edit10, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12").hide ();
$('input[type=checkbox]').attr('checked', false);
$('input[type=checkbox]').attr('disabled', true);
$('#module_type').val(-1);
@ -558,12 +605,34 @@ $(document).ready (function () {
if (this.id == "checkbox-force_type") {
if (this.checked) {
$(".select_modules_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 ();
}
else {
$(".select_modules_row_2").css('display', '');
if ($('#module_name option:selected').val() == undefined) {
$("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, tr#delete_table-edit10, tr#delete_table-edit11, tr#delete_table-edit12").hide ();
$("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, " +
"tr#delete_table-edit81, " +
"tr#delete_table-edit82, " +
"tr#delete_table-edit9, " +
"tr#delete_table-edit10, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12").hide ();
}
}
}
@ -584,12 +653,40 @@ $(document).ready (function () {
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, tr#delete_table-edit10, tr#delete_table-edit11, tr#delete_table-edit12").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, " +
"tr#delete_table-edit81, " +
"tr#delete_table-edit82, " +
"tr#delete_table-edit9, " +
"tr#delete_table-edit10, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12").show ();
}
else {
$(".select_agents_row_2").css('display', '');
if ($('#id_agents option:selected').val() == undefined) {
$("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, tr#delete_table-edit10, tr#delete_table-edit11, tr#delete_table-edit12").hide ();
$("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, " +
"tr#delete_table-edit81, " +
"tr#delete_table-edit82, " +
"tr#delete_table-edit9, " +
"tr#delete_table-edit10, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12").hide ();
}
}
}
@ -637,7 +734,21 @@ $(document).ready (function () {
$(".select_agents_row_2").css('display', '');
}
$("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, tr#delete_table-edit10, tr#delete_table-edit11, tr#delete_table-edit12").hide ();
$("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, " +
"tr#delete_table-edit81, " +
"tr#delete_table-edit82, " +
"tr#delete_table-edit9, " +
"tr#delete_table-edit10, " +
"tr#delete_table-edit11, " +
"tr#delete_table-edit12").hide ();
jQuery.post ("ajax.php",
{"page" : "operation/agentes/ver_agente",

101
pandora_console/include/javascript/pandora.js
View File

@ -375,56 +375,63 @@ function module_changed_by_multiple_modules (event, id_module, selected) {
}
jQuery.post('ajax.php',
{"page": "operation/agentes/ver_agente",
"get_agents_json_for_multiple_modules": 1,
"module_name[]": idModules,
"selection_mode": selection_mode
},
function (data) {
$('#agents').append ($('<option></option>').html ("Loading...").attr ("value", 0));
{"page": "operation/agentes/ver_agente",
"get_agents_json_for_multiple_modules": 1,
"module_name[]": idModules,
"selection_mode": selection_mode
},
function (data) {
$('#agents')
.append ($('<option></option>').html ("Loading...").attr ("value", 0));
$('#agents').empty ();
if (isEmptyObject(data)) {
var noneText = $("#none_text").html(); //Trick for catch the translate text.
if (noneText == null) {
noneText = 'None';
}
$('#agents')
.append($('<option></option>').html (noneText).attr ("None", "").attr('selected', true));
return;
}
if (typeof($(document).data('text_for_module')) != 'undefined') {
$('#agents')
.append ($('<option></option>').html ($(document).data('text_for_module')).attr("value", 0).attr('selected', true));
}
else {
if (typeof(data['any_text']) != 'undefined') {
$('#agents')
.append ($('<option></option>').html (data['any_text']).attr ("value", 0).attr('selected', true));
}
else {
var anyText = $("#any_text").html(); //Trick for catch the translate text.
$('#agents').empty ();
if (isEmptyObject(data)) {
var noneText = $("#none_text").html(); //Trick for catch the translate text.
if (noneText == null) {
noneText = 'None';
}
$('#agents').append ($('<option></option>').html (noneText).attr ("None", "").attr('selected', true));
return;
if (anyText == null) {
anyText = 'Any';
}
if (typeof($(document).data('text_for_module')) != 'undefined') {
$('#agents').append ($('<option></option>').html ($(document).data('text_for_module')).attr("value", 0).attr('selected', true));
}
else {
if (typeof(data['any_text']) != 'undefined') {
$('#agents').append ($('<option></option>').html (data['any_text']).attr ("value", 0).attr('selected', true));
}
else {
var anyText = $("#any_text").html(); //Trick for catch the translate text.
if (anyText == null) {
anyText = 'Any';
}
$('#agents').append ($('<option></option>').html (anyText).attr ("value", 0).attr('selected', true));
}
}
jQuery.each (data, function (i, val) {
s = js_html_entity_decode(val);
$('#agents').append ($('<option></option>').html (s).attr ("value", val));
$('#agents').fadeIn ('normal');
});
if (selected != undefined)
$('#agents').attr ('value', selected);
$('#agents').removeAttr('disabled');
},
"json"
);
$('#agents')
.append($('<option></option>').html (anyText).attr ("value", 0).attr('selected', true));
}
}
jQuery.each (data, function (i, val) {
s = js_html_entity_decode(val);
$('#agents')
.append ($('<option></option>').html (s).attr ("value", val));
$('#agents').fadeIn ('normal');
});
if (selected != undefined)
$('#agents').attr ('value', selected);
$('#agents').removeAttr('disabled');
},
"json"
);
}
/**

2
pandora_console/index.php
View File

@ -592,7 +592,7 @@ require('include/php_to_js_values.php');
return rv;
};
})();
//Dynamically assign footer position and width.
function adjustFooter() {
if (document.readyState !== 'complete') {