Anomalie #142: Tags favoris

src/Muzich/CoreBundle/Repository/GroupRepository.php

@@ -76,16 +76,18 @@ class GroupRepository extends EntityRepository
    * 
    * @return doctrine_collection
    */
-  public function getElementsTags($group_id)
+  public function getElementsTags($group_id, $current_user_id)
   {
     return $this->getEntityManager()
       ->createQuery('
         SELECT t FROM MuzichCoreBundle:Tag t
         LEFT JOIN t.elements e
         WHERE e.group = :gid
+        AND (t.tomoderate = \'FALSE\' OR t.tomoderate IS NULL
+          OR t.privateids LIKE :uidt)
         ORDER BY t.name ASC'
       )
-      ->setParameter('gid', $group_id)
+      ->setParameters(array('gid' => $group_id, 'uidt' => '%"'.$current_user_id.'"%'))
       ->getResult()
     ;
   }

src/Muzich/CoreBundle/Repository/UserRepository.php

@@ -185,7 +185,7 @@ class UserRepository extends EntityRepository
    * 
    * @return doctrine_collection
    */
-  public function getElementsTags($user_id)
+  public function getElementsTags($user_id, $current_user_id)
   {
     return $this->getEntityManager()
       ->createQuery('
@@ -196,7 +196,7 @@ class UserRepository extends EntityRepository
           OR t.privateids LIKE :uidt)
         ORDER BY t.name ASC'
       )
-      ->setParameters(array('uid' => $user_id, 'uidt' => '%"'.$user_id.'"%'))
+      ->setParameters(array('uid' => $user_id, 'uidt' => '%"'.$current_user_id.'"%'))
       ->getResult()
     ;
   }

src/Muzich/CoreBundle/Repository/UsersElementsFavoritesRepository.php

@@ -12,7 +12,7 @@ class UsersElementsFavoritesRepository extends EntityRepository
    * 
    * @return doctrine_collection
    */
-  public function getTags($user_id)
+  public function getTags($user_id, $current_user_id)
   {
     return $this->getEntityManager()
       ->createQuery('
@@ -24,7 +24,7 @@ class UsersElementsFavoritesRepository extends EntityRepository
           OR t.privateids LIKE :uidt)
         ORDER BY t.name ASC'
       )
-      ->setParameters(array('uid' => $user_id, 'uidt' => '%"'.$user_id.'"%'))
+      ->setParameters(array('uid' => $user_id, 'uidt' => '%"'.$current_user_id.'"%'))
       ->getResult()
     ;
   }

src/Muzich/CoreBundle/Tests/Controller/ShowControllerTest.php

@@ -46,7 +46,7 @@ class ShowControllerTest extends FunctionalTest
       ->findOneByName('Antropod - Polakatek')
     ;
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-      ->getElementsTags($bux->getId())      
+      ->getElementsTags($bux->getId(), $bux->getId())      
     ;
     
     $ids = array();
@@ -123,7 +123,7 @@ class ShowControllerTest extends FunctionalTest
       ->findOneByName('PsyElement 1')
     ;
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')
-      ->getElementsTags($fan_de_psy->getId())      
+      ->getElementsTags($fan_de_psy->getId(), $bux->getId())      
     ;
     
     $ids = array();

src/Muzich/CoreBundle/Tests/Tag/TagReadTest.php

@@ -151,7 +151,7 @@ class TagReadTest extends UnitTest
     $rtags = array('Electro', 'Hardcore', 'Hardtek', 'Metal');
     
     $tags = $this->getTagsNamesForQuery($this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-      ->getElementsTags($bux->getId())      
+      ->getElementsTags($bux->getId(), $bux->getId())      
     );
     
     $this->assertEquals($rtags, $tags);
@@ -160,7 +160,7 @@ class TagReadTest extends UnitTest
     $rtags = array('Beatbox', 'Chanteuse', 'Dubstep', 'Medieval');
     
     $tags = $this->getTagsNamesForQuery($this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-      ->getElementsTags($joelle->getId())      
+      ->getElementsTags($joelle->getId(), $joelle->getId())      
     );
     
     $this->assertEquals($rtags, $tags);
@@ -169,7 +169,7 @@ class TagReadTest extends UnitTest
     $rtags = array('Hardtek', 'Psytrance', 'Tribe');
     
     $tags = $this->getTagsNamesForQuery($this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-      ->getElementsTags($paul->getId())      
+      ->getElementsTags($paul->getId(), $paul->getId())      
     );
     
     $this->assertEquals($rtags, $tags);
@@ -186,7 +186,7 @@ class TagReadTest extends UnitTest
     $rtags = array('Hardtek');
     
     $tags = $this->getTagsNamesForQuery($this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
-      ->getTags($bux->getId())          
+      ->getTags($bux->getId(), $bux->getId())          
     );
     
     $this->assertEquals($rtags, $tags);
@@ -195,7 +195,7 @@ class TagReadTest extends UnitTest
     $rtags = null;
     
     $tags = $this->getTagsNamesForQuery($this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
-      ->getTags($joelle->getId())           
+      ->getTags($joelle->getId(), $joelle->getId())           
     );
     
     $this->assertEquals($rtags, $tags);
@@ -204,7 +204,7 @@ class TagReadTest extends UnitTest
     $rtags = array('Hardtek', 'Tribe');
     
     $tags = $this->getTagsNamesForQuery($this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
-      ->getTags($paul->getId())          
+      ->getTags($paul->getId(), $paul->getId())
     );
     
     $this->assertEquals($rtags, $tags);

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -149,7 +149,7 @@ class FavoriteController extends Controller
     ));
     
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
-      ->getTags($this->getUserId())      
+      ->getTags($this->getUserId(), $this->getUserId())      
     ;
     
     $tags_id = array();
@@ -183,7 +183,7 @@ class FavoriteController extends Controller
     ));
     
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:UsersElementsFavorites')
-      ->getTags($viewed_user->getId())      
+      ->getTags($viewed_user->getId(), $this->getUserId())      
     ;
     
     $tags_id = array();

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -27,7 +27,7 @@ class ShowController extends Controller
     ));
     
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')
-      ->getElementsTags($viewed_user->getId())      
+      ->getElementsTags($viewed_user->getId(), $this->getUserId())      
     ;
     
     $tags_id = array();
@@ -71,7 +71,7 @@ class ShowController extends Controller
     }
     
     $tags = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')
-      ->getElementsTags($group->getId())      
+      ->getElementsTags($group->getId(), $this->getUserId())      
     ;
     
     $tags_id = array();