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

2014-03-05 Miguel de Dios <miguel.dedios@artica.es> 

* include/ajax/module.php: fixed the ajax calls for to get json
	data.
	
	Incident: #619




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9508 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-05 12:07:01 +00:00
parent 1587e571ce
commit 3b8dad7c6b
2 changed files with 15 additions and 5 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 @@
2014-03-05 Miguel de Dios <miguel.dedios@artica.es>
* include/ajax/module.php: fixed the ajax calls for to get json
data.
Incident: #619
2014-03-05 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql

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

@ -16,6 +16,7 @@
global $config;
include_once($config['homedir'] . "/include/functions_agents.php");
include_once($config['homedir'] . "/include/functions_ui.php");
enterprise_include_once ('include/functions_metaconsole.php');
@ -33,11 +34,6 @@ if ($get_plugin_macros) {
return;
}
ui_require_jquery_file ("ui-timepicker-addon");
// This script is included manually to be included after jquery and avoid error
echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
$search_modules = get_parameter('search_modules');
if ($search_modules) {
@ -61,6 +57,13 @@ $get_module_detail = get_parameter ('get_module_detail', 0);
if ($get_module_detail) {
ui_require_jquery_file ("ui-timepicker-addon");
// This script is included manually to be included after jquery and avoid error
echo '<script type="text/javascript" src="' .
ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' .
get_user_language(), false, false, false) . '"></script>';
ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
$module_id = get_parameter ('id_module');
$period = get_parameter ("period", 86400);
$group = agents_get_agentmodule_group ($module_id);