瀏覽代碼

Prise en compte lors des affichages des tags a modérer.

bastien 13 年之前
父節點
當前提交
8509d23020

+ 6 - 1
src/Muzich/CoreBundle/Controller/SearchController.php 查看文件

@@ -400,14 +400,19 @@ class SearchController extends Controller
400 400
           }
401 401
         }
402 402
 
403
+        $params['uid'] = '%"'.$this->getUserId().'"%';
403 404
         $tags = $this->getDoctrine()->getEntityManager()->createQuery("
404 405
           SELECT t.name, t.slug, t.id FROM MuzichCoreBundle:Tag t
405 406
           $where
407
+          
408
+          AND (t.tomoderate = '0'
409
+          OR t.privateids LIKE :uid)
410
+          
406 411
           ORDER BY t.name ASC"
407 412
         )->setParameters($params)
408 413
         ->getScalarResult()
409 414
         ;
410
-
415
+        
411 416
         $tags_response = array();
412 417
         foreach ($tags as $tag)
413 418
         {

+ 3 - 1
src/Muzich/CoreBundle/Repository/ElementRepository.php 查看文件

@@ -182,7 +182,8 @@ class ElementRepository extends EntityRepository
182 182
       $query_select = "SELECT e, t, o, g, fav
183 183
         FROM MuzichCoreBundle:Element e 
184 184
         LEFT JOIN e.group g 
185
-        LEFT JOIN e.tags t 
185
+        LEFT JOIN e.tags t WITH (t.tomoderate = '0'
186
+          OR t.privateids LIKE :uidt)
186 187
         LEFT JOIN e.elements_favorites fav WITH fav.user = :uid
187 188
         JOIN e.owner o
188 189
         WHERE e.id IN (:ids)
@@ -190,6 +191,7 @@ class ElementRepository extends EntityRepository
190 191
       ;
191 192
 
192 193
       $params_select['ids'] = $ids;
194
+      $params_select['uidt'] = '%"'.$user_id.'"%';
193 195
       $query = $this->getEntityManager()
194 196
         ->createQuery($query_select)
195 197
         ->setParameters($params_select)