Optimisation et refactorisation du systèmé de récupération des element de l'ElementSearch.

src/Muzich/CoreBundle/Controller/SearchController.php

@@ -48,24 +48,4 @@ class SearchController extends Controller
     }
   }
   
-  /**
-   *  Procédure chargé d'afficher les résultats de la recherche.
-   */
-  public function doSearchElementsAction(ElementSearcher $search, $template = 'default')
-  {
-    $elements = $this->getDoctrine()
-      ->getRepository('MuzichCoreBundle:Element')
-      ->findBySearch($search, $this->getUser()->getId())
-      ->execute()
-    ;
-    
-    return $this->render(
-      'MuzichCoreBundle:SearchElement:default.html.twig', 
-      array(
-        'user' => $this->getUser(),
-        'elements' => $elements
-      )
-    );
-  }   
-  
 }

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -2,6 +2,8 @@
 
 namespace Muzich\CoreBundle\Searcher;
 
+use Symfony\Bundle\DoctrineBundle\Registry;
+
 class ElementSearcher extends Searcher implements SearcherInterface
 {
   
@@ -132,4 +134,19 @@ class ElementSearcher extends Searcher implements SearcherInterface
     return $this->favorite;
   }
   
+  /**
+   * Retourne les elements correspondant a la recherche
+   * 
+   * @param Registry $doctrine
+   * @return collection
+   */
+  public function doSearch(Registry $doctrine, $user_id)
+  {
+    return $doctrine
+      ->getRepository('MuzichCoreBundle:Element')
+      ->findBySearch($this, $user_id)
+      ->execute()
+    ;
+  }
+  
 }

src/Muzich/FavoriteBundle/Controller/FavoriteController.php

@@ -68,7 +68,8 @@ class FavoriteController extends Controller
     ));
     
     return array(
-        'search_object' => $search_object
+      'user'     => $this->getUser(),
+      'elements' => $search_object->doSearch($this->getDoctrine(), $this->getUserId())
     );
   }
   
@@ -88,8 +89,9 @@ class FavoriteController extends Controller
     ));
     
     return array(
+      'user'        => $this->getUser(),
       'viewed_user' => $viewed_user,
-      'search_object' => $search_object
+      'elements'    => $search_object->doSearch($this->getDoctrine(), $this->getUserId())
     );
   }
   

src/Muzich/FavoriteBundle/Resources/views/Favorite/myList.html.twig

@@ -12,6 +12,6 @@
 
   <h2>{{ 'favorites.your_favorites'|trans({}, 'network') }}</h2>
 
-  {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
     
 {% endblock %}

src/Muzich/FavoriteBundle/Resources/views/Favorite/userList.html.twig

@@ -12,6 +12,6 @@
 
   <h2>{{ 'favorites.user_favorites'|trans({'%name%' : viewed_user.name}, 'network') }}</h2>
 
-  {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
     
 {% endblock %}

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -13,6 +13,9 @@ class HomeController extends Controller
 {
   
   /**
+   * Page d'accueil ("home") de l'utilisateur. Cette page regroupe le fil
+   * d'éléments général et personalisable et de quoi ajouter un élément.
+   * 
    * @Template()
    */
   public function indexAction()
@@ -37,9 +40,10 @@ class HomeController extends Controller
     );
         
     return array(
-      'add_form'      => $add_form->createView(),
-      'search_object' => $search_object,
-      'search_form'   => $search_form->createView()
+      'user'        => $this->getUser(),
+      'add_form'    => $add_form->createView(),
+      'search_form' => $search_form->createView(),
+      'elements'    => $search_object->doSearch($this->getDoctrine(), $this->getUserId())
     );
   }
 }

src/Muzich/HomeBundle/Controller/ShowController.php

@@ -16,17 +16,16 @@ class ShowController extends Controller
   public function showUserAction($slug)
   {
     $viewed_user = $this->findUserWithSlug($slug);
-    $user = $this->getUser();
         
     $search_object = $this->createSearchObject(array(
       'user_id'  => $viewed_user->getId()
     ));
     
     return array(
-      'viewed_user'   => $viewed_user,
-      'search_object' => $search_object,
-      'following'     => $user->isFollowingUserByQuery($this->getDoctrine(), $viewed_user->getId()),
-      'user'          => $user
+      'viewed_user' => $viewed_user,
+      'elements'    => $search_object->doSearch($this->getDoctrine(), $this->getUserId()),
+      'following'   => $this->getUser()->isFollowingUserByQuery($this->getDoctrine(), $viewed_user->getId()),
+      'user'        => $this->getUser()
     );
   }
   
@@ -38,18 +37,17 @@ class ShowController extends Controller
   public function showGroupAction($slug)
   {
     $group = $this->findGroupWithSlug($slug);
-    $user = $this->getUser();
         
     $search_object = $this->createSearchObject(array(
       'group_id'  => $group->getId()
     ));
     
     return array(
-      'group'         => $group,
-      'his_group'     => ($group->getOwner()->getId() == $user->getId()) ? true : false,
-      'search_object' => $search_object,
-      'following'     => $user->isFollowingGroupByQuery($this->getDoctrine(), $group->getId()),
-      'user'          => $user
+      'group'     => $group,
+      'his_group' => ($group->getOwner()->getId() == $this->getUserId()) ? true : false,
+      'elements'  => $search_object->doSearch($this->getDoctrine(), $this->getUserId()),
+      'following' => $this->getUser()->isFollowingGroupByQuery($this->getDoctrine(), $group->getId()),
+      'user'      => $this->getUser()
     );
   }
   

src/Muzich/HomeBundle/Resources/views/Home/index.html.twig

@@ -15,6 +15,6 @@
 
   {% include "MuzichCoreBundle:SearchElement:form.html.twig" %}
 
-  {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
     
 {% endblock %}

src/Muzich/HomeBundle/Resources/views/Show/showGroup.html.twig

@@ -24,6 +24,6 @@
     
   <h2>{{ group.name }}</h2>
   
-  {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
     
 {% endblock %}

src/Muzich/HomeBundle/Resources/views/Show/showUser.html.twig

@@ -22,6 +22,6 @@
 
   <h2>{{ viewed_user.name }}</h2>
   
-  {% render "MuzichCoreBundle:Search:doSearchElements" with { 'search': search_object } %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
     
 {% endblock %}