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

2013-05-22 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/visual_console_builder.editor.js: fixed the
	update the module graph item.
	
	Fixes: #2234
	
	* godmode/reporting/visual_console_builder.php: fixed lost height
	and width of item when add several module graphs.
	
	MERGED FROM THE BRANCH 4




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8190 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-05-22 15:08:24 +00:00
parent 576df64ab8
commit db1f7342d8
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/ChangeLog
View File

@ -1,3 +1,15 @@
2013-05-22 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the
update the module graph item.
Fixes: #2234
* godmode/reporting/visual_console_builder.php: fixed lost height
and width of item when add several module graphs.
MERGED FROM THE BRANCH 4
2013-05-22 Hirofumi Kosaka <kosaka@rworks.jp>
* pandoradb.sql: (workaround to avoid mysql's warning

1
pandora_console/godmode/reporting/visual_console_builder.editor.js
View File

@ -1233,6 +1233,7 @@ function updateDB_visual(type, idElement , values, event, top, left) {
switch (type) {
case 'module_graph':
$("#image_" + idElement).attr("src", getModuleGraph(idElement));
break;
case 'static_graph':
if ((event != 'resizestop') && (event != 'show_grid')
&& (event != 'dragstop')) {

5
pandora_console/godmode/reporting/visual_console_builder.php
View File

@ -235,6 +235,11 @@ switch ($activeTab) {
$message = '';
if (($width == 0) && ($height == 0) && ($type == MODULE_GRAPH)) {
$width = 300;
$height = 180;
}
// One item per agent
if ($item_per_agent == 1) {
$id_agents_result = array();