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

Lot of improvements on all the trees of the tree view

This commit is contained in:
Alejandro Gallardo Escobar 2015-01-28 18:57:33 +01:00
parent 059afa931c
commit bb358dd4dd
2 changed files with 871 additions and 975 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1596
pandora_console/include/class/Tree.class.php
View File

File diff suppressed because it is too large Load Diff

10
pandora_console/include/javascript/tree/TreeController.js
View File

@ -417,14 +417,6 @@ TreeController = {
// Load the status counters // Load the status counters
var hasCounters = _processNodeCounters($content, element.counters, element.type); var hasCounters = _processNodeCounters($content, element.counters, element.type);
// if ((element.type == "group" || element.type == "tag")
// && (controller.shouldHaveCounters && !hasCounters))
// return;
if ((element.type == "group" || element.type == "tag")
&& (element.agentsNum <= 0))
return;
// If exist the detail container, show the data // If exist the detail container, show the data
if (typeof controller.detailRecipient != 'undefined' && controller.detailRecipient.length > 0) { if (typeof controller.detailRecipient != 'undefined' && controller.detailRecipient.length > 0) {
$content.click(function (e) { $content.click(function (e) {
@ -486,7 +478,7 @@ TreeController = {
$leafIcon.click(function (e) { $leafIcon.click(function (e) {
e.preventDefault(); e.preventDefault();
if (!$node.hasClass("children-loaded") && !$node.hasClass("leaf-empty")) { if (!$node.hasClass("leaf-loading") && !$node.hasClass("children-loaded") && !$node.hasClass("leaf-empty")) {
$node $node
.removeClass("leaf-closed") .removeClass("leaf-closed")
.removeClass("leaf-error") .removeClass("leaf-error")