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

Merge branch 'ent-7809-no-se-despliegan-subgrupos-vista-arbol' into 'develop' 

Fixed issues with subgroups in Tree view

Closes pandora_enterprise#7809

See merge request artica/pandorafms!4307
This commit is contained in:
Daniel Rodriguez 2021-07-20 09:37:34 +00:00
parent 63a8ff3f53 8968d6abb9
commit 26bcb0d078
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -962,7 +962,7 @@ var TreeController = {
}
// If exist the detail container, show the data
if (
typeof controller.detailRecipient !== "undefined" &&
typeof controller.detailRecipient !== "undefined" ||
disabled == false
) {
if (element.type == "agent" || element.type == "module") {
@ -997,12 +997,10 @@ var TreeController = {
$node.addClass("leaf-empty");
if (
typeof element.children != "undefined" &&
element.children.length > 0 &&
(typeof element.children != "undefined" &&
element.children.length > 0) ||
element.disabled == false
) {
$node.removeClass("leaf-empty").addClass("leaf-closed");
// Add children
var $children = _processGroup($node, element.children);
$node.data("children", $children);
@ -1032,13 +1030,13 @@ var TreeController = {
}
if (
typeof element.searchChildren != "undefined" &&
element.searchChildren
(typeof element.searchChildren != "undefined" &&
element.searchChildren) ||
element.disabled == true
) {
if (
(element.rootType == "group_edition" &&
typeof element.children == "undefined") ||
element.disabled == true
element.rootType == "group_edition" &&
typeof element.children == "undefined"
) {
$node.addClass("leaf-empty");
} else {