Evolution #204: token de filtre

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -298,7 +298,23 @@ class ElementController extends Controller
       return $response;
     }
     
-    $es = $this->getElementSearcher();
+    if ($this->getRequest()->getMethod() != 'POST')
+    {
+      throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException();
+    }
+    
+    /*
+     * On met à jour l'ElementSearcher avec le form
+     */
+    $es = $this->getElementSearcher(null, true);
+    $search_form = $this->getSearchForm($es);
+    $search_form->bindRequest($this->getRequest());
+    
+    if ($search_form->isValid())
+    {
+      $es->update($search_form->getData());
+    }
+    
     $es->update(array(
       // On veux de nouveaux éléments
       'searchnew' => true,
@@ -335,7 +351,23 @@ class ElementController extends Controller
       return $response;
     }
     
-    $es = $this->getElementSearcher();
+    if ($this->getRequest()->getMethod() != 'POST')
+    {
+      throw new \Symfony\Component\HttpKernel\Exception\NotFoundHttpException();
+    }
+    
+    /*
+     * On met à jour l'ElementSearcher avec le form
+     */
+    $es = $this->getElementSearcher(null, true);
+    $search_form = $this->getSearchForm($es);
+    $search_form->bindRequest($this->getRequest());
+    
+    if ($search_form->isValid())
+    {
+      $es->update($search_form->getData());
+    }
+    
     $es->update(array(
       // On veux de nouveaux éléments
       'searchnew' => true,

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -113,14 +113,29 @@ class ElementRepository extends EntityRepository
     // Construction des conditions pour la selection d'ids
     $where_tags = '';
     $join_tags  = '';
-    if (count(($tags = $searcher->getTags())))
+    
+    /*
+     * des fois on se retrouve avec un string au lieu d'un tableau
+     */
+    $tags = $searcher->getTags();
+    
+    if (!is_array($tags))
+    {
+      $tags_decoded = json_decode($tags);
+      $tags = array();
+      foreach ($tags_decoded as $tag_id)
+      {
+        $tags[$tag_id] = $tag_id;
+      }
+    }
+    
+    if (count($tags))
     {
-      
       foreach ($tags as $tag_id => $tag_name)
       {
         // LEFT JOIN car un element n'est pas obligatoirement lié a un/des tags
         $join_tags = " LEFT JOIN e_.tags t_";
-        
+
         // Construction du chere pour les tags
         if ($where_tags == '')
         {

web/bundles/muzichcore/js/muzich.js

@@ -1289,21 +1289,46 @@ $(document).ready(function(){
           +'/'
           +str_replace('element_', '', $('ul.elements li:first').attr('id'))
         ;
-        $.getJSON(url, function(response){
+        
+        $.ajax({
+          type: 'POST',
+          url: url,
+          data: $('form[name="search"]').serialize(),
+          success: function(response){
           
-          if (response.status == 'mustbeconnected')
-          {
-            $(location).attr('href', url_index);
-          }
+            if (response.status == 'mustbeconnected')
+            {
+              $(location).attr('href', url_index);
+            }
 
-          if (response.status == 'success' && response.count)
-          {
-            $('div.display_more_elements').show();
-            $('div.display_more_elements span').html(response.message);
-          }
+            if (response.status == 'success' && response.count)
+            {
+              $('div.display_more_elements').show();
+              $('div.display_more_elements span').html(response.message);
+            }
 
-          setTimeout(check_new_elements, 150000);
+            setTimeout(check_new_elements, 150000);
+          },
+          dataType: "json"
         });
+        
+        
+//        $.getJSON(url, function(response){
+//          
+//          if (response.status == 'mustbeconnected')
+//          {
+//            $(location).attr('href', url_index);
+//          }
+//
+//          if (response.status == 'success' && response.count)
+//          {
+//            $('div.display_more_elements').show();
+//            $('div.display_more_elements span').html(response.message);
+//          }
+//
+//          setTimeout(check_new_elements, 150000);
+//        });
+        
         do_check_new_elements = false;
       }
       
@@ -1321,31 +1346,65 @@ $(document).ready(function(){
       +str_replace('element_', '', $('ul.elements li:first').attr('id'))
     ;
     $('img.elements_new_loader').show();
-    $.getJSON(url, function(response){
-      
-      if (response.status == 'mustbeconnected')
-      {
-        $(location).attr('href', url_index);
-      }
+    
+    
+    $.ajax({
+      type: 'POST',
+      url: url,
+      data: $('form[name="search"]').serialize(),
+      success: function(response){
       
-      if (response.status == 'success')
-      {
-        if (response.count)
+        if (response.status == 'mustbeconnected')
         {
-          $('div.display_more_elements').show();
-          $('div.display_more_elements span').html(response.message);
+          $(location).attr('href', url_index);
         }
-        else
+
+        if (response.status == 'success')
         {
-          $('div.display_more_elements').hide();
+          if (response.count)
+          {
+            $('div.display_more_elements').show();
+            $('div.display_more_elements span').html(response.message);
+          }
+          else
+          {
+            $('div.display_more_elements').hide();
+          }
+
+          $('ul.elements').prepend(response.html);
+          recolorize_element_list();
         }
-        
-        $('ul.elements').prepend(response.html);
-        recolorize_element_list();
-      }
-      
-      $('img.elements_new_loader').hide();
+
+        $('img.elements_new_loader').hide();
+      },
+      dataType: "json"
     });
+    
+//    $.getJSON(url, function(response){
+//      
+//      if (response.status == 'mustbeconnected')
+//      {
+//        $(location).attr('href', url_index);
+//      }
+//      
+//      if (response.status == 'success')
+//      {
+//        if (response.count)
+//        {
+//          $('div.display_more_elements').show();
+//          $('div.display_more_elements span').html(response.message);
+//        }
+//        else
+//        {
+//          $('div.display_more_elements').hide();
+//        }
+//        
+//        $('ul.elements').prepend(response.html);
+//        recolorize_element_list();
+//      }
+//      
+//      $('img.elements_new_loader').hide();
+//    });
   });
 
   function recolorize_element_list()