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

Fixed the ajax calls with timepicker in other languages instead english. 

(cherry picked from commit 15c93c3bd9)

Conflicts:
	pandora_console/include/ajax/module.php
This commit is contained in:
mdtrooper 2015-02-19 18:33:42 +01:00
parent cd20ae0d2f
commit c11a81dbef
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/ajax/module.php
View File

@ -79,7 +79,7 @@ if ($get_module_detail) {
if (defined ('METACONSOLE')) {
$server = metaconsole_get_connection ($server_name);
if (metaconsole_connect($server) != NOERR)
return;
$conexion = false;
@ -87,7 +87,7 @@ if ($get_module_detail) {
else {
$conexion = false;
}
html_debug_print($conexion, true);
$selection_mode = get_parameter('selection_mode', 'fromnow');
$date_from = (string) get_parameter ('date_from', date ('Y-m-j'));
$time_from = (string) get_parameter ('time_from', date ('h:iA'));

12
pandora_console/include/functions_ui.php
View File

@ -3575,10 +3575,18 @@ function ui_get_error ($error_code) {
}
function ui_include_time_picker() {
ui_require_jquery_file ("ui-timepicker-addon");
if (is_ajax ()) {
echo '<script type="text/javascript" src="' .
ui_get_full_url(false, false, false, false) .
'include/javascript/jquery.ui-timepicker-addon.js' . '"></script>';
}
else {
ui_require_jquery_file ("ui-timepicker-addon");
}
if (file_exists('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js')) {
echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js', false, false, false) . '"></script>';
echo '<script type="text/javascript" src="' .
ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js', false, false, false) . '"></script>';
}
}
?>