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

Merge pull request #797 from FafnerKeyZee/2.4 

Solving #786
pull/762/merge
Andras Iklody 2015-12-28 16:28:28 +01:00
parent f580d758f7 ead30f6846
commit c162443fe5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/EventsController.php
View File

@ -1393,7 +1393,7 @@ class EventsController extends AppController {
'fields' => array('id', 'progress'),
'conditions' => array(
'job_type' => 'cache_' . $k,
'org' => $useOrg
'org_id' => $useOrg
),
'order' => array('Job.id' => 'desc')
));

2
app/Controller/JobsController.php
View File

@ -70,7 +70,7 @@ class JobsController extends AppController {
$progress = $this->Job->find('first', array(
'conditions' => array(
'job_type' => $type,
'org' => $org
'org_id' => $org
),
'fields' => array('id', 'progress'),
'order' => array('Job.id' => 'desc'),