Merge branch 'feature/v0.8/needtags' into stable/v0.8

app/Resources/translations/navigationui.fr.yml

@@ -5,6 +5,7 @@ container_menu:
   my_favorites:         Mes favoris
   my_feeds:             Mes diffusions
   return:               Retour
+  need_tags:            Demandes
   
 top_bar:
   my_account:           Mon compte (%name%)
@@ -40,6 +41,7 @@ title:
   hello:                Découvrez et partagez la musique !
   element:
     edit:               Modification d'un élément
+  need_tags:            Partages en demande de tags
   
   
 bottom_menu:

app/Resources/translations/userui.fr.yml

@@ -154,4 +154,10 @@ search_tag:
   title:                 Recherche de tag correspondant à \"%string_search%\" ...
   
 global_search:
-  no_results:            Il n'y a aucun résultat a votre recherche.
+  no_results:            Il n'y a aucun résultat a votre recherche.
+  
+need_tags:
+  text_help:             |
+                         Les utilisateurs ayant partagés leurs découvertes ont
+                         demandé de l'aide pour tagger correctement leurs partages.
+                         Gagnez en réputation en leurs proposants les tags qui conviennent !

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -743,6 +743,7 @@ class ElementController extends Controller
       $element->addTag($tag);
     }
     $element->setHasTagProposition(false);
+    $element->setNeedTags(false);
     $this->getDoctrine()->getEntityManager()->persist($element);
     
     $event = new EventElement($this->container);

src/Muzich/CoreBundle/Resources/config/routing.yml

@@ -154,11 +154,13 @@ global_search:
 teapot:
   pattern: /what/are/you
   defaults: { _controller: MuzichCoreBundle:Info:teapot }
-  
 #
 
 element_retrieve_api_datas:
   pattern: /ajax/element/get/datas/api
   defaults: { _controller: MuzichCoreBundle:Element:getDatasApi }
   requirements:
-    method:  POST
+    
+element_show_need_tags:
+  pattern: /need-tags
+  defaults: { _controller: MuzichHomeBundle:Home:needTags }

src/Muzich/CoreBundle/Resources/views/Menu/containerMenu.html.twig

@@ -12,14 +12,19 @@
         {{ 'container_menu.my_network'|trans({}, 'navigationui') }}
       </a>
     </li>
-    <li {% if active == 'myfeeds' %} class="active" {% endif %}>
-      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
-        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+    <li {% if active == 'needs-tags' %} class="active" {% endif %}>
+      <a href="{{ path('element_show_need_tags') }}">
+        {{ 'container_menu.need_tags'|trans({}, 'navigationui') }}
       </a>
     </li>
   </ul>
 
   <ul class="top-tabs-right">
+    <li {% if active == 'myfeeds' %} class="active" {% endif %}>
+      <a href="{{ path('show_user', {'slug': app.user.slug}) }}">
+        {{ 'container_menu.my_feeds'|trans({}, 'navigationui') }}
+      </a>
+    </li>
     <li class="{% if active == 'mygroups' %}active{% endif %}">
       <a href="{{ path('groups_own_list') }}" >
         {{ 'network.mygroups'|trans({}, 'navigationui') }}

src/Muzich/CoreBundle/Searcher/ElementSearcher.php

@@ -107,11 +107,12 @@ class ElementSearcher extends Searcher implements SearcherInterface
    */
   protected $string = null;
   
-  private $attributes = array(
-    'network', 'tags', 'count', 'user_id', 'group_id', 
-    'favorite', 'id_limit', 'searchnew', 'ids', 'ids_display',
-    'tag_strict', 'string'
-  );
+  /**
+   * Pour la recherche de partage qui demande des tags.
+   * 
+   * @var boolean 
+   */
+  protected $need_tags = false;
   
   /**
    * @see SearcherInterface
@@ -339,4 +340,13 @@ class ElementSearcher extends Searcher implements SearcherInterface
     return $this->searchnew;
   }
   
+  public function isNeedTags()
+  {
+    if ($this->need_tags)
+    {
+      return true;
+    }
+    return false;
+  }
+  
 }

src/Muzich/CoreBundle/Searcher/ElementSearcherQueryBuilder.php

@@ -264,6 +264,15 @@ class ElementSearcherQueryBuilder
       }
     }
   }
+  
+  private function buildNeedTags()
+  {
+    // Si id_limit est précisé c'est que l'on demande "la suite" ou "les nouveaux"
+    if ($this->es->isNeedTags())
+    {
+      $this->query_ids->andWhere("e.need_tags  = '1'");
+    }
+  }
 
   /**
    *
@@ -299,6 +308,8 @@ class ElementSearcherQueryBuilder
     $this->buildLimits();
     // Si on recherche les tags de manière stricte
     $this->buildStrict();
+    // Si on recherche des partages en demande de tags
+    $this->buildNeedTags();
     
     $this->query_ids->setParameters($this->parameters_ids);
   }

src/Muzich/CoreBundle/Searcher/Searcher.php

@@ -23,15 +23,14 @@ abstract class Searcher
     foreach ($params as $param_id => $param_value)
     {
       // TODO: check existance attribut
-//      if (isset($this->$param_id))
-//      {
+      if (property_exists($this, $param_id))
+      {
         $this->$param_id = $param_value;
-//      }
-//      else
-//      {
-//        die(var_dump($this->$param_id));
-//        throw new \Exception("You're trying access unknow attribute '$param_id'");
-//      }
+      }
+      else
+      {
+        throw new \Exception("You're trying access unknow attribute '$param_id'");
+      }
     }
   }
 

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -213,8 +213,9 @@ class FunctionalTest extends WebTestCase
    * @param string $url
    * @param array $tags
    * @param string $group_slug 
+   * @param boolean $need_tags 
    */
-  protected function procedure_add_element($name, $url, $tags, $group_slug = null)
+  protected function procedure_add_element($name, $url, $tags, $group_slug = null, $need_tags = false)
   {
     if (!$group_slug)
     {
@@ -231,7 +232,16 @@ class FunctionalTest extends WebTestCase
     $form = $this->selectForm('form[action="'.$form_url.'"] input[type="submit"]');
     $form['element_add[name]'] = $name;
     $form['element_add[url]'] = $url;
-    $form['element_add[tags]'] = json_encode($tags);
+    
+    if (count($tags))
+    {
+      $form['element_add[tags]'] = json_encode($tags);
+    }
+    
+    if ($need_tags)
+    {
+      $form['element_add[need_tags]'] = true;
+    }
     
     $this->submit($form);
   }
@@ -519,5 +529,9 @@ class FunctionalTest extends WebTestCase
       ->findOneBy($params);
   }
   
+  protected function goToPage($url)
+  {
+    $this->crawler = $this->client->request('GET', $url);
+  }
   
 }

src/Muzich/HomeBundle/Controller/HomeController.php

@@ -4,10 +4,7 @@ namespace Muzich\HomeBundle\Controller;
 
 use Muzich\CoreBundle\lib\Controller;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
-
-use Doctrine\ORM\Query;
-use Muzich\CoreBundle\Form\Search\ElementSearchForm;
-use Muzich\CoreBundle\Form\Element\ElementAddForm;
+use Muzich\CoreBundle\Searcher\ElementSearcher;
 
 class HomeController extends Controller
 {
@@ -29,12 +26,12 @@ class HomeController extends Controller
     $add_form = $this->getAddForm();
     
     $elements = $search_object->getElements($this->getDoctrine(), $this->getUserId());
-    $count_elements = count($elements);
+    //$count_elements = count($elements);
     
     return array(
       'search_tags_id'   => $search_object->getTags(),
       'ids_display'      => $search_object->getIdsDisplay(),
-      'user'             => $this->getUser(),
+      'user'             => $user,
       'add_form'         => $add_form->createView(),
       'add_form_name'    => 'add',
       'search_form'      => $search_form->createView(),
@@ -44,4 +41,18 @@ class HomeController extends Controller
       //'display_more_button' => ($count_elements >= $this->container->getParameter('search_default_count'))?true:false
     );
   }
+  
+  public function needTagsAction()
+  {
+    $es = new ElementSearcher();
+    $es->init(array(
+      'count'     => $this->container->getParameter('search_default_count'),
+      'need_tags' => true
+    ));
+    
+    return $this->render('MuzichHomeBundle:Home:need_tags.html.twig', array(
+      'elements' => $es->getElements($this->getDoctrine(), $this->getUserId())
+    ));
+  }
+  
 }

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

@@ -0,0 +1,27 @@
+{% extends "MuzichHomeBundle::layout.html.twig" %}
+
+{% block title %}{{ 'title.need_tags'|trans({}, 'navigationui') }}{% endblock %}
+
+{% block content %}
+
+  <h1>{{ 'title.need_tags'|trans({}, 'navigationui') }}</h1>
+
+  <p>{{ 'need_tags.text_help'|trans({}, 'userui') }}</p>
+  
+  <div class="display_more_elements" style="display: none;">
+    <span></span>
+  </div>
+
+  <div class="elements_loader_div">
+    <img class="elements_new_loader" style="display: none;" src="{{ asset('/bundles/muzichcore/img/ajax-loader.gif') }}" alt="loading" />
+  </div>
+
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" %}
+    
+  {% include "MuzichCoreBundle:SearchElement:more_button.html.twig" with {
+    'display_more_button' : true,
+    'elements_length'     : elements|length,
+    'more_path'           : 'search_elements'
+  }%}
+  
+{% endblock %}