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

Fixed the bug that tree view in meta console does not work properly.

This commit is contained in:
KIKUCHI Koichiro 2015-01-16 19:12:45 +09:00
parent f5e6be1dba
commit 1cc9937422
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_treeview.php
View File

@ -527,7 +527,7 @@ function treeview_printTree($type) {
$first = true; $first = true;
foreach ($list as $item) { foreach ($list as $item) {
$lessBranchs = 0; $lessBranchs = 0;
$tree_img_id = "tree_image_" . $type . "_" . $item['_id_']; $tree_img_id = "tree_image_" . $type . "__" . $item['_id_'];
if ($first) { if ($first) {
if ($item != end($list)) { if ($item != end($list)) {
$img = html_print_image ("operation/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "0")); $img = html_print_image ("operation/tree/first_closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "0"));
@ -581,7 +581,7 @@ function treeview_printTree($type) {
echo ') '. "</a>"; echo ') '. "</a>";
echo "<div hiddenDiv='1' loadDiv='0' style='margin: 0px; padding: 0px;' class='tree_view' id='tree_div_" . $type . "_" . $id . "'></div>"; echo "<div hiddenDiv='1' loadDiv='0' style='margin: 0px; padding: 0px;' class='tree_view' id='tree_div_" . $type . "__" . $id . "'></div>";
echo "</li>\n"; echo "</li>\n";
} }
echo "</ul>\n"; echo "</ul>\n";

6
pandora_console/operation/tree.php
View File

@ -224,7 +224,7 @@ if (is_ajax ()) {
} }
$less = $lessBranchs; $less = $lessBranchs;
$tree_img_id = "tree_image" . $id . "_agent_" . $type . "_" . $row["id_agente"]; $tree_img_id = "tree_image" . $id . "_agent_" . $type . "_" . $row["server_name"] . "_" . $row["id_agente"];
if ($count != $countRows) if ($count != $countRows)
$img = html_print_image ("operation/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "2")); $img = html_print_image ("operation/tree/closed.png", true, array ("style" => 'vertical-align: middle;', "id" => $tree_img_id, "pos_tree" => "2"));
else { else {
@ -263,7 +263,7 @@ if (is_ajax ()) {
html_print_image("images/dot_green.disabled.png", false, array("border" => '0', "title" => __('Quiet'), "alt" => "")); html_print_image("images/dot_green.disabled.png", false, array("border" => '0', "title" => __('Quiet'), "alt" => ""));
} }
echo "</a>"; echo "</a>";
echo "<div hiddenDiv='1' loadDiv='0' style='margin: 0px; padding: 0px;' class='tree_view' id='tree_div" . $id . "_agent_" . $type . "_" . $row["id_agente"] . "'></div>"; echo "<div hiddenDiv='1' loadDiv='0' style='margin: 0px; padding: 0px;' class='tree_view' id='tree_div" . $id . "_agent_" . $type . "_" . $row["server_name"] . "_" . $row["id_agente"] . "'></div>";
echo "</li>"; echo "</li>";
} }
@ -703,7 +703,7 @@ ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascri
* id_father int use in js and ajax php, its useful when you have a two subtrees with same agent for diferent each one * id_father int use in js and ajax php, its useful when you have a two subtrees with same agent for diferent each one
*/ */
function loadSubTree(type, div_id, less_branchs, id_father, server_name) { function loadSubTree(type, div_id, less_branchs, id_father, server_name) {
var id = id_father + '_' + type + '_' + div_id; var id = id_father + '_' + type + '_' + server_name + '_' + div_id;
var hiddenDiv = $('#tree_div' + id).attr('hiddenDiv'); var hiddenDiv = $('#tree_div' + id).attr('hiddenDiv');
var loadDiv = $('#tree_div' + id).attr('loadDiv'); var loadDiv = $('#tree_div' + id).attr('loadDiv');