Cadoles/ninegate
21
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Compare commits

base: Cadoles:21fc95f71e8a484e0949a7651cbd85d2252d460c
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable
..
compare: Cadoles:3818a38106d20a05109e9151966d484f8c0b85da
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable

No commits in common. "21fc95f71e8a484e0949a7651cbd85d2252d460c" and "3818a38106d20a05109e9151966d484f8c0b85da" have entirely different histories.
21fc95f71e ... 3818a38106

1 changed files with 7 additions and 10 deletions
Show Stats Expand all files Collapse all files

11
src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/AlertRepository.php
View File

@ -46,8 +46,6 @@ class AlertRepository extends EntityRepository
$niveau01=($user?$user->getNiveau01():null); $niveau01=($user?$user->getNiveau01():null);
$groups=($user?$user->getGroups():[]); $groups=($user?$user->getGroups():[]);
$userreads=($user?$user->getAlertreaders():[]);
// Initialisation du calcul des alerts // Initialisation du calcul des alerts
$alerts=new ArrayCollection(); $alerts=new ArrayCollection();
@ -69,9 +67,8 @@ class AlertRepository extends EntityRepository
->setParameter("alertcategory",$alertcategoryfilter); ->setParameter("alertcategory",$alertcategoryfilter);
} }
$alertsroles=$qb->getQuery()->getResult(); $alertsroles=$qb->getQuery()->getResult();
foreach($alertsroles as $alertrole) { foreach($alertsroles as $alertrole) {
if(!$alerts->contains($alertrole)&&!$userreads->contains($alertrole)) $alerts->add($alertrole); if(!$alerts->contains($alertrole)&&!$alertrole->getReaders()->contains($user)) $alerts->add($alertrole);
} }
} }
@ -94,7 +91,7 @@ class AlertRepository extends EntityRepository
} }
$alertsniveau01s=$qb->getQuery()->getResult(); $alertsniveau01s=$qb->getQuery()->getResult();
foreach($alertsniveau01s as $alertniveau01) { foreach($alertsniveau01s as $alertniveau01) {
if(!$alerts->contains($alertniveau01)&&!$userreads->contains($alertniveau01)) $alerts->add($alertniveau01); if(!$alerts->contains($alertniveau01)&&!$alertniveau01->getReaders()->contains($user)) $alerts->add($alertniveau01);
} }
// Récupération des alerts par group // Récupération des alerts par group
@ -117,7 +114,7 @@ class AlertRepository extends EntityRepository
} }
$alertsgroups=$qb->getQuery()->getResult(); $alertsgroups=$qb->getQuery()->getResult();
foreach($alertsgroups as $alertgroup) { foreach($alertsgroups as $alertgroup) {
if(!$alerts->contains($alertgroup)&&!$userreads->contains($alertgroup)) $alerts->add($alertgroup); if(!$alerts->contains($alertgroup)&&!$alertgroup->getReaders()->contains($user)) $alerts->add($alertgroup);
} }
} }
@ -145,7 +142,7 @@ class AlertRepository extends EntityRepository
} }
$alertsitems=$qb->getQuery()->getResult(); $alertsitems=$qb->getQuery()->getResult();
foreach($alertsitems as $alertitem) { foreach($alertsitems as $alertitem) {
if(!$alerts->contains($alertitem)&&!$userreads->contains($alertitem)) $alerts->add($alertitem); if(!$alerts->contains($alertitem)&&!$alertitem->getReaders()->contains($user)) $alerts->add($alertitem);
} }
} }