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

Compare commits

base: Cadoles:0ed4fec378dfcf3d036590946206501314d09be8
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable
..
compare: Cadoles:e1458a0cac1f011566ee0ad480039fc946c0d3c6
Branches Tags
Cadoles:master
Cadoles:dist/envole/6/master
Cadoles:build/envole/envole-6/unstable

No commits in common. "0ed4fec378dfcf3d036590946206501314d09be8" and "e1458a0cac1f011566ee0ad480039fc946c0d3c6" have entirely different histories.
0ed4fec378 ... e1458a0cac

2 changed files with 3 additions and 16 deletions
Show Stats Expand all files Collapse all files

2
src/ninegate-1.0/app/AppKernel.php
View File

@ -16,6 +16,7 @@ class AppKernel extends Kernel
new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(), new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(), new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(), new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
new \Symfony\Bundle\MakerBundle\MakerBundle(),
new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(), new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
new Symfony\Bundle\AsseticBundle\AsseticBundle(), new Symfony\Bundle\AsseticBundle\AsseticBundle(),
@ -46,7 +47,6 @@ class AppKernel extends Kernel
$bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle(); $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
$bundles[] = new Symfony\Bundle\MakerBundle\MakerBundle();
if ('dev' === $this->getEnvironment()) { if ('dev' === $this->getEnvironment()) {
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();

17
src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php
View File

@ -34,7 +34,6 @@ class ItemRepository extends EntityRepository
$items=new ArrayCollection(); $items=new ArrayCollection();
// Récupération des items par rôles // Récupération des items par rôles
$itemsroles=[];
foreach($roles as $role) { foreach($roles as $role) {
$qb = $this->getEntityManager()->createQueryBuilder(); $qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('item') $qb->select('item')
@ -58,7 +57,6 @@ class ItemRepository extends EntityRepository
} }
// Récupération des items par group // Récupération des items par group
$itemsgroups=[];
foreach($groups as $group) { foreach($groups as $group) {
$qb = $this->getEntityManager()->createQueryBuilder(); $qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('item') $qb->select('item')
@ -77,6 +75,7 @@ class ItemRepository extends EntityRepository
} }
$itemsgroups=$qb->getQuery()->getResult(); $itemsgroups=$qb->getQuery()->getResult();
foreach($itemsgroups as $itemgroup) { foreach($itemsgroups as $itemgroup) {
if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup); if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
} }
@ -84,7 +83,6 @@ class ItemRepository extends EntityRepository
// Récupération des items par niveau01 // Récupération des items par niveau01
$itemsniveau01s=[];
if($niveau01) { if($niveau01) {
$qb = $this->getEntityManager()->createQueryBuilder(); $qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('item') $qb->select('item')
@ -109,7 +107,6 @@ class ItemRepository extends EntityRepository
} }
// Récupération des items par ssoitem // Récupération des items par ssoitem
$itemsssoitems=[];
foreach($ssoitems as $ssoitem) { foreach($ssoitems as $ssoitem) {
$qb = $this->getEntityManager()->createQueryBuilder(); $qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('item') $qb->select('item')
@ -128,22 +125,12 @@ class ItemRepository extends EntityRepository
} }
$itemsssoitems=$qb->getQuery()->getResult(); $itemsssoitems=$qb->getQuery()->getResult();
foreach($itemsssoitems as $itemssoitem) { foreach($itemsssoitems as $itemssoitem) {
if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) $items->add($itemssoitem); if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) $items->add($itemssoitem);
} }
} }
// Pour chaque bookmark lié à un item : on vérifie qu'il est tjr la permission de voir cet item sinon on l'enlève de ses fav
foreach($bookmarks as $key => $bookmark) {
$item=$bookmark->getItem();
if($item) {
if(!in_array($item,$itemsroles) && !in_array($item,$itemsgroups) && !in_array($item,$itemsniveau01s) && !in_array($item,$itemsssoitems) ) {
unset($bookmarks[$key]);
}
}
}
// Trie des items // Trie des items
$itemsordered = $items->getIterator(); $itemsordered = $items->getIterator();
$itemsordered->uasort(function ($first, $second) { $itemsordered->uasort(function ($first, $second) {