talents-tube/website
6
0
Fork 0
Code Issues Pull Requests Releases 103 Wiki Activity

Bug candidatures (sF v1 et web app)

Browse Source
This commit is contained in:
llaniau
2021-03-10 14:12:46 +01:00
parent c0e25f5d10
commit a5636bf2b5
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
volume/www/website/www/src/AppBundle/Controller/AnswerController.php
+5 -7
View File
@@ -681,16 +681,14 @@ class AnswerController extends Controller
// But if that werent't the case, its value should have been tested
// before assigning it to $responseTemp
if($answer->getCompany()){
if($answer->getAd()){
$responseTemp = $answer->getAd()->getTitle();
}else{
$responseTemp = "Candidature spontanée";
}
if($answer->getAd()){
$responseTemp = $answer->getAd()->getTitle();
}else{
$responseTemp = "ND";
$responseTemp = "Candidature spontanée";
}
break;
}
volume/www/website/www/src/AppBundle/Repository/AnswerRepository.php
+4 -2
View File
@@ -190,11 +190,13 @@ class AnswerRepository extends AbstractRepository
->join('a.user', 'user')
->leftjoin('a.ad', 'ad')
->leftjoin('a.video', 'video')
->leftjoin('a.company', 'c')
->leftjoin('ad.company', 'company');
$countQuery
->join('a.user', 'user')
->leftjoin('a.ad', 'ad')
->leftjoin('a.video', 'video')
->leftjoin('a.company', 'c')
->leftjoin('ad.company', 'company');
// $countQuery
// ->join('town.department', 'department')
@@ -205,8 +207,8 @@ class AnswerRepository extends AbstractRepository
{
// No
// However, add a "always true" condition to keep an uniform treatment in all cases
$query->where("company.id=".$otherConditions);
$countQuery->where("company.id=".$otherConditions);
$query->where("(company.id=".$otherConditions." OR c.id=".$otherConditions.")");
$countQuery->where("(company.id=".$otherConditions." OR c.id=".$otherConditions.")");
$query->andWhere("a.status='SENDED'");
$countQuery->andWhere("a.status='SENDED'");
}else{