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

2010-05-13 Miguel de Dios <miguel.dedios@artica.es> 

* include/javascript/pandora.js: check if exist the "any" text translation.
	* godmode/reporting/visual_console_builder.wizard.php: add the "any"
	translation.
	Fixes: #3000496



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2713 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2010-05-13 11:51:23 +00:00
parent a5e3def249
commit 123016de9d
3 changed files with 25 additions and 3 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 @@
2010-05-13 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/pandora.js: check if exist the "any" text translation.
* godmode/reporting/visual_console_builder.wizard.php: add the "any"
translation.
Fixes: #3000496
2010-05-13 Miguel de Dios <miguel.dedios@artica.es>
* install.php: check the exit library "Multibyte String".

3
pandora_console/godmode/reporting/visual_console_builder.wizard.php
View File

@ -75,6 +75,9 @@ print_input_hidden ('id_visual_console', $visualConsole["id"]);
print_submit_button (__('Add'), 'go', false, 'class="sub wizard wand"');
echo '</div>';
echo '</form>';
//Trick for it have a traduct text for javascript.
echo '<span id="any_text" style="display: none;">' . __('Any') . '</span>';
?>
<script language="javascript" type="text/javascript">
$(document).ready (function () {

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

@ -75,13 +75,25 @@ function agent_changed (event, id_agent, selected) {
"id_agent": id_agent
},
function (data) {
$('#module').empty ();
if (typeof($(document).data('text_for_module')) != 'undefined') {
$('#module').append ($('<option></option>').html ($(document).data('text_for_module')).attr("value", 0).attr('selected', true));
}
else {
$('#module').append ($('<option></option>').html (data['any_text']).attr ("value", 0).attr('selected', true));
if (typeof(data['any_text']) != 'undefined') {
$('#module').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';
}
$('#module').append ($('<option></option>').html (anyText).attr ("value", 0).attr('selected', true));
}
}
jQuery.each (data, function (i, val) {
s = js_html_entity_decode (val['nombre']);
@ -161,7 +173,7 @@ function agent_module_autocomplete (id_agent_name, id_agent_id, id_agent_module_
scroll:true,
extraParams: {
page: "include/ajax/agent",
search_agents: 1,
search_agents: 1
},
formatItem: function (data, i, total) {
if (total == 0)