When user hace acl's and tags dont see data in tree view, its fixed. Tiquet:#2508

This commit is contained in:
m-lopez-f 2015-07-21 13:26:07 +02:00
parent 0ef4510990
commit 6b6f18a695

View File

@ -1746,29 +1746,41 @@ class Tree {
} }
public function getData() { public function getData() {
if (! defined('METACONSOLE')) { if (! defined('METACONSOLE')) {
switch ($this->type) { if ($this->strictACL) {
case 'os': switch ($this->type) {
$this->getDataOS(); case 'group':
break; case 'tag':
case 'group': $this->getDataStrict();
$this->getDataGroup(); break;
break; case 'agent':
case 'module_group': $this->getDataAgent();
$this->getDataModuleGroup(); break;
break; }
case 'module': }
$this->getDataModules(); else{
break; switch ($this->type) {
case 'tag': case 'os':
$this->getDataTag(); $this->getDataOS();
break; break;
case 'agent': case 'group':
$this->getDataAgent(); $this->getDataGroup();
break; break;
default: case 'module_group':
$this->getDataExtended(); $this->getDataModuleGroup();
break;
case 'module':
$this->getDataModules();
break;
case 'tag':
$this->getDataTag();
break;
case 'agent':
$this->getDataAgent();
break;
default:
$this->getDataExtended();
}
} }
} }
else if ($this->strictACL) { else if ($this->strictACL) {