MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Fix to the bulk search when logged in as a non admin 

The search filter was broken and didn't return the expected result. Should
be fixed.
pull/195/head
iglocska 2013-05-22 15:50:31 +02:00
parent c9d0ccdffb
commit 7cc15743c1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Controller/AttributesController.php
View File

@ -793,19 +793,19 @@ class AttributesController extends AppController {
$conditions['Event.orgc ='] = $org;
}
$this->Attribute->recursive = 0;
$this->paginate = array(
'limit' => 60,
'maxLimit' => 9999, // LATER we will bump here on a problem once we have more than 9999 attributes?
'conditions' => $conditions
);
if (!$this->_IsSiteAdmin()) {
// merge in private conditions
$this->paginate = Set::merge($this->paginate, array(
$this->paginate = array(
'limit' => 60,
'conditions' =>
array("AND" => $conditions,
array("OR" => array(
array('Event.org =' => $this->Auth->user('org')),
array("AND" => array('Event.org !=' => $this->Auth->user('org')), array('Event.private !=' => 1), array('Attribute.private !=' => 1)))),
)
array("AND" => array('Event.org !=' => $this->Auth->user('org')), array('Event.private !=' => 1), array('Attribute.private !=' => 1))))));
} else {
$this->paginate = array(
'limit' => 60,
'conditions' => $conditions
);
}
$idList = array();