Adaptation de findBySearch (Element) pour limiter aux groupes suivis lorsque mynetwork.

src/Muzich/CoreBundle/DataFixtures/ORM/LoadElementData.php

@@ -50,6 +50,8 @@ class LoadElementData  extends AbstractFixture implements OrderedFixtureInterfac
     $element->setType($type);
     $element->setOwner($owner);
     $element->setDateAdded($date);
+    if ($group)
+      $element->setGroup($group);
     $this->addReference('element_'.$reference_id, $element);
     
     foreach ($tags as $tag)

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -40,9 +40,11 @@ class ElementRepository extends EntityRepository
       case ElementSearcher::NETWORK_PERSONAL:
         
         $join_personal = "
-          JOIN eu.followers_users f WITH f.follower = :userid
-        ";
+          LEFT JOIN eu.followers_users f WITH f.follower = :userid "
+          ."LEFT JOIN g.followers gf WITH gf.follower = :useridg"
+          ;
         $params['userid'] = $user_id;
+        $params['useridg'] = $user_id;
         
       break;
     }
@@ -60,12 +62,20 @@ class ElementRepository extends EntityRepository
     
     $query_join2 = ' JOIN e.owner';
     
-    $query_string = "SELECT e, et, t, eu 
+    $query_string = "SELECT e, et, t, eu, g
       FROM MuzichCoreBundle:Element e 
-      JOIN e.type et JOIN e.tags t $query_with JOIN e.owner eu $join_personal
+      LEFT JOIN e.group g JOIN e.type et JOIN e.tags t $query_with 
+        JOIN e.owner eu $join_personal
       ORDER BY e.date_added DESC "
     ;
     
+//    $query_string = "
+//      SELECT e, g
+//      FROM MuzichCoreBundle:Element e 
+//      LEFT JOIN e.group g
+//      ORDER BY e.date_added DESC
+//    ";
+    
     $query = $this->getEntityManager()
       ->createQuery($query_string)
       ->setParameters($params)

src/Muzich/CoreBundle/Resources/views/SearchElement/default.html.twig

@@ -1,12 +1,15 @@
 <ul>
   {% for element in elements %} 
     <li>
-      {{element.name}} ({{element.owner.username}})
-        <a href="{{element.url}}" target="_blank">link</a>
+      {% if element.group %}
+        <b>({{ element.group.name }})</b>
+      {% endif %}
+      {{ element.name }} ({{ element.owner.username }})
+        <a href="{{ element.url }}" target="_blank">link</a>
         <ul>
           {% for tag in element.tags %} 
             <li>
-              {{tag.name}}
+              {{ tag.name }}
             </li>
           {% endfor %} 
         </ul>