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

2013-06-24 Miguel de Dios <miguel.dedios@artica.es> 

* godmode/reporting/visual_console_builder.editor.js: fixed the
	moving the lines when the item is a graph.
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-24 11:49:57 +00:00
parent 307788383b
commit b281382fa3
2 changed files with 13 additions and 4 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-06-24 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.editor.js: fixed the
moving the lines when the item is a graph.
MERGED FROM THE BRANCH PANDORA_4.0
2013-06-24 Miguel de Dios <miguel.dedios@artica.es> 2013-06-24 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php, * include/functions_visual_map.php,

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

@ -193,7 +193,7 @@ function readFields() {
var values = {}; var values = {};
values['label'] = $("input[name=label]").val(); values['label'] = $("input[name=label]").val();
var text = tinymce.get('text-label2').getContent(); var text = tinymce.get('text-label2').getContent();
@ -1256,9 +1256,6 @@ function updateDB_visual(type, idElement , values, event, top, left) {
} }
switch (type) { switch (type) {
case 'module_graph':
$("#image_" + idElement).attr("src", getModuleGraph(idElement));
break;
case 'static_graph': case 'static_graph':
if ((event != 'resizestop') && (event != 'show_grid') if ((event != 'resizestop') && (event != 'show_grid')
&& (event != 'dragstop')) { && (event != 'dragstop')) {
@ -1330,6 +1327,11 @@ function updateDB_visual(type, idElement , values, event, top, left) {
case 'simple_value': case 'simple_value':
case 'label': case 'label':
case 'icon': case 'icon':
case 'module_graph':
if (type == 'module_graph')
$("#image_" + idElement).attr("src", getModuleGraph(idElement));
if ((typeof(values['mov_left']) != 'undefined') && if ((typeof(values['mov_left']) != 'undefined') &&
(typeof(values['mov_top']) != 'undefined')) { (typeof(values['mov_top']) != 'undefined')) {
$("#" + idElement).css('top', '0px').css('top', top + 'px'); $("#" + idElement).css('top', '0px').css('top', top + 'px');