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

fixed metaconsole tree view

This commit is contained in:
daniel 2018-09-05 11:23:53 +02:00
parent 2829ddd8dd
commit 51f71d1a07
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/include/ajax/tree.ajax.php
View File

@ -44,6 +44,7 @@ if (is_ajax ()) {
require_once($config['homedir'] . "/include/class/TreeTag.class.php"); require_once($config['homedir'] . "/include/class/TreeTag.class.php");
require_once($config['homedir'] . "/include/class/TreeGroup.class.php"); require_once($config['homedir'] . "/include/class/TreeGroup.class.php");
enterprise_include_once("include/class/TreePolicies.class.php"); enterprise_include_once("include/class/TreePolicies.class.php");
enterprise_include_once("include/class/TreeGroupMeta.class.php");
require_once($config['homedir'] . "/include/functions_reporting.php"); require_once($config['homedir'] . "/include/functions_reporting.php");
require_once($config['homedir'] . "/include/functions_os.php"); require_once($config['homedir'] . "/include/functions_os.php");
@ -91,7 +92,13 @@ if (is_ajax ()) {
$tree = new TreeTag($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access); $tree = new TreeTag($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
break; break;
case 'group': case 'group':
$tree = new TreeGroup($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access); if(is_metaconsole()){
if (!class_exists('TreeGroupMeta')) break;
$tree = new TreeGroupMeta($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
}
else{
$tree = new TreeGroup($type, $rootType, $id, $rootID, $serverID, $childrenMethod, $access);
}
break; break;
case 'policies': case 'policies':
if (!class_exists('TreePolicies')) break; if (!class_exists('TreePolicies')) break;

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

@ -70,6 +70,11 @@ class Tree {
} }
public function setFilter($filter) { public function setFilter($filter) {
// There is not module filter in metaconsole.
if (is_metaconsole()) {
$filter['searchModule'] = "";
$filter['statusModule'] = self::TV_DEFAULT_AGENT_STATUS;
}
$this->filter = $filter; $this->filter = $filter;
} }
@ -952,7 +957,6 @@ class Tree {
$inner_or_left = $this->getInnerOrLeftJoin(); $inner_or_left = $this->getInnerOrLeftJoin();
$group_inner = $this->getGroupSearchInner(); $group_inner = $this->getGroupSearchInner();
$id_os = $this->rootID;
$group_acl = $this->getGroupAclCondition(); $group_acl = $this->getGroupAclCondition();
$group_search_filter = $this->getGroupSearchFilter(); $group_search_filter = $this->getGroupSearchFilter();
$agent_search_filter = $this->getAgentSearchFilter(); $agent_search_filter = $this->getAgentSearchFilter();