hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3239-purge-queue

Browse Source
This commit is contained in:
Nicolas Maillat
2020-10-21 14:06:17 +02:00
committed by GitHub
parent e613e4db45 d0bec62dc0
commit e0af0baaf6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Model/Repositories/WorkerRunningJobRepository.php
View File

@@ -85,8 +85,8 @@ class WorkerRunningJobRepository extends EntityRepository
$qb = $this->createQueryBuilder('w');
$qb->where($qb->expr()->in('w.databoxId', $databoxIds))
->andWhere('w.work = :work')
->andWhere('w.status != :status')
->setParameters([ 'work' => MessagePublisher::POPULATE_INDEX_TYPE, 'status' => WorkerRunningJob::FINISHED])
->andWhere('w.status = :status')
->setParameters([ 'work' => MessagePublisher::POPULATE_INDEX_TYPE, 'status' => WorkerRunningJob::RUNNING])
;
return count($qb->getQuery()->getResult());

4
lib/Alchemy/Phrasea/WorkerManager/Controller/AdminConfigurationController.php
View File

@@ -102,7 +102,9 @@ class AdminConfigurationController extends Controller
/**
* @param Request $request
* @param integer $workerId
* @param $workerId
* @return \Symfony\Component\HttpFoundation\JsonResponse
* @throws \Doctrine\ORM\OptimisticLockException
*/
public function changeStatusAction(Request $request, $workerId)
{