Evolution #179: Proposition de tag: évolution

src/Muzich/CoreBundle/Entity/Element.php

@@ -509,6 +509,16 @@ class Element
     return $this->has_tags_proposition;
   }
   
+  public function getTagsProposition()
+  {
+    return $this->tags_propositions;
+  }
+  
+  public function setTagsPRopositions($propositions)
+  {
+    $this->tags_propositions = $propositions;
+  }
+  
   /**
    * Etablie des relation vers des tags.
    * (Supprime les anciens tags, au niveau de l'objet seulement)

src/Muzich/CoreBundle/Repository/ElementRepository.php

@@ -53,9 +53,9 @@ class ElementRepository extends EntityRepository
       
       if (($id_limit = $searcher->getIdLimit()))
       {
-        return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), $id_limit, $searcher->getCount());
+        return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), $id_limit, $searcher->getCount(), $searcher->getIdsDisplay());
       }
-      return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds());
+      return $this->getSelectElementForSearchQuery($params_select, $user_id, $searcher->getIds(), null, null, $searcher->getIdsDisplay());
     }
     
     
@@ -232,7 +232,7 @@ class ElementRepository extends EntityRepository
     ;
   }
   
-  protected function getSelectElementForSearchQuery($params_select, $user_id, $ids, $id_limit = null, $count_limit = null)
+  protected function getSelectElementForSearchQuery($params_select, $user_id, $ids, $id_limit = null, $count_limit = null, $ids_display = null)
   {    
     $where = "";
     if ($id_limit)
@@ -240,14 +240,23 @@ class ElementRepository extends EntityRepository
       $where = "AND e.id < :id_limit";
       $params_select['id_limit'] = $id_limit;
     }
+    
+    $select = '';
+    $left_join = '';
+    if ($ids_display)
+    {
+      $select = ', tp, tpu, tpt';
+      $left_join = 'LEFT JOIN e.tags_propositions tp LEFT JOIN tp.user tpu LEFT JOIN tp.tags tpt';
+    }
       
     // C'est la requête qui récupérera les données element avec ses jointures.
-    $query_select = "SELECT e, t, o, g, fav
+    $query_select = "SELECT e, t, o, g, fav $select
       FROM MuzichCoreBundle:Element e 
       LEFT JOIN e.group g 
       LEFT JOIN e.tags t WITH (t.tomoderate = 'FALSE' OR t.tomoderate IS NULL
         OR t.privateids LIKE :uidt)
       LEFT JOIN e.elements_favorites fav WITH fav.user = :uid
+      $left_join
       JOIN e.owner o
       WHERE e.id IN (:ids) $where
       ORDER BY e.created DESC, e.id DESC"

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

@@ -209,6 +209,17 @@
   </tr>
 </table>
 
+{% if ids_display is defined %}
+{% if ids_display == event_const('TYPE_TAGS_PROPOSED') %}
+
+  {% include 'MuzichCoreBundle:Element:tag.propositions.html.twig' with {
+    'propositions' : element.getTagsProposition,
+    'element_id'   : element.id
+  } %}
+
+{% endif %}
+{% endif %}
+
 {% if element.embed %}
   {% autoescape false %}
     <div id="embed_{{ element.id }}" class="element_embed" style="display: none;">

web/bundles/muzichcore/js/muzich.js

@@ -1789,6 +1789,7 @@ $(document).ready(function(){
     $(this).parents('div.tag_proposition').slideUp();
   });
   
+  // Ouvrir les propositions de tags de l'élément
   $('a.element_view_propositions_link').live('click', function(){
     
     var link = $(this);