Evolution #164: Proposition de tag sur un élément

app/Resources/translations/users.fr.yml

@@ -25,6 +25,10 @@ events:
     no:                         Pas de nouveaux utilisateurs qui vous suivent
     one:                        %count% nouvel utilisateur vous suis
     yes:                        %count% nouveaux utilisateurs vous suivent
+  new_tags:
+    no:                         Pas de nouvelle proposition de tags
+    one:                        %count% nouveau partage avec proposition de tags
+    yes:                        %count% nouveaux partages avec proposition de tags
     
 reputation:
   bar:

app/Resources/translations/userui.fr.yml

@@ -67,6 +67,7 @@ filter:
   network_my:    Mon réseau
   new_comments:     Nvx commentaires
   new_favoriteds:   Nvx favoris
+  new_tags:         Propositions de tags
   
 element_add:
   url:

src/Muzich/CoreBundle/Controller/CoreController.php

@@ -615,6 +615,7 @@ class CoreController extends Controller
     
     $es = $this->getElementSearcher();
     $es->setIds(null);
+    $es->setIdsDisplay(null);
     $this->setElementSearcherParams($es->getParams());
     
     $html = $this->render('MuzichCoreBundle:SearchElement:default.html.twig', array(

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -553,6 +553,15 @@ class ElementController extends Controller
       ));
     }
     
+    // On ne doit pas pouvoir proposer de tags sur son propre élément
+    if ($element->getOwner()->getId() == $this->getUserId())
+    {
+      return $this->jsonResponse(array(
+        'status' => 'error',
+        'errors' => array('NotAllowed')
+      ));
+    }
+    
     $values   = $this->getRequest()->request->get('element_tag_proposition_'.$element->getId());
     $tags_ids = json_decode($values['tags'], true);
     
@@ -597,6 +606,11 @@ class ElementController extends Controller
     
     $this->getDoctrine()->getEntityManager()->persist($element);
     $this->getDoctrine()->getEntityManager()->persist($proposition);
+    
+    // Notifs etc 
+    $event = new EventElement($this->container);
+    $event->tagsProposed($element);
+    
     $this->getDoctrine()->getEntityManager()->flush();
     
     return $this->jsonResponse(array(

src/Muzich/CoreBundle/Entity/Event.php

@@ -21,6 +21,7 @@ class Event
   const TYPE_COMMENT_ADDED_ELEMENT = "com.adde.ele";
   const TYPE_FAV_ADDED_ELEMENT     = "fav.adde.ele";
   const TYPE_USER_FOLLOW           = "user.follow";
+  const TYPE_TAGS_PROPOSED         = "tags.prop.ad";
   
   /**
    * @ORM\Id

src/Muzich/CoreBundle/Extension/MyTwigExtension.php

@@ -131,6 +131,9 @@ class MyTwigExtension extends \Twig_Extension {
       case 'TYPE_USER_FOLLOW':
         return Event::TYPE_USER_FOLLOW;
       break;
+      case 'TYPE_TAGS_PROPOSED':
+        return Event::TYPE_TAGS_PROPOSED;
+      break;
       default:
         throw new \Exception('Constante non géré dans MyTwigExtension::event_const');
       break;

src/Muzich/CoreBundle/Propagator/EventElement.php

@@ -124,4 +124,16 @@ class EventElement extends EventPropagator
     );
   }
   
+  /**
+   * Des tags viennent d'être proposé a un élément
+   *
+   * @param Element $element 
+   */
+  public function tagsProposed(Element $element)
+  {
+    $uea = new UserEventAction($element->getOwner(), $this->container);
+    $event = $uea->proceed(Event::TYPE_TAGS_PROPOSED, $element->getId());
+    $this->container->get('doctrine')->getEntityManager()->persist($event);
+  }
+  
 }

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

@@ -17,18 +17,28 @@
   </div>
 
   <div class="more_filters">
+    
     <a href="{{ path('ajax_filter_remove_ids') }}" class="button active new_comments" 
        style="{% if ids_display != event_const('TYPE_COMMENT_ADDED_ELEMENT') %}display: none;{% endif %}"
     >
       {{ 'filter.new_comments'|trans({}, 'userui') }}
       <img src="{{ asset('bundles/muzichcore/img/1328276855_list-remove.png') }}" alt="remove" />
     </a>
+      
     <a href="{{ path('ajax_filter_remove_ids') }}" class="button active new_favorites" 
        style="{% if ids_display != event_const('TYPE_FAV_ADDED_ELEMENT') %}display: none;{% endif %}"
     >
       {{ 'filter.new_favoriteds'|trans({}, 'userui') }}
       <img src="{{ asset('bundles/muzichcore/img/1328276855_list-remove.png') }}" alt="remove" />
     </a>
+      
+    <a href="{{ path('ajax_filter_remove_ids') }}" class="button active new_tags" 
+       style="{% if ids_display != event_const('TYPE_TAGS_PROPOSED') %}display: none;{% endif %}"
+    >
+      {{ 'filter.new_tags'|trans({}, 'userui') }}
+      <img src="{{ asset('bundles/muzichcore/img/1328276855_list-remove.png') }}" alt="remove" />
+    </a>
+    
   </div>
   
   {% include "MuzichCoreBundle:Tag:tagsPrompt.html.twig" with { 

src/Muzich/UserBundle/Resources/views/Info/bar.html.twig

@@ -59,6 +59,24 @@
         {% endif %}
           
     </div>
+    
+    <div class="tags">
+      
+        {% if events[event_const('TYPE_TAGS_PROPOSED')] is defined %}
+          <a 
+            href="{{ path('event_view_elements', {'event_id':events[event_const('TYPE_TAGS_PROPOSED')].id}) }}" 
+            title="{%if events[event_const('TYPE_TAGS_PROPOSED')].count == 1 %}{{ 'events.new_tags.one'|trans({'%count%':1}, 'users') }}{% else %}{{ 'events.new_tags.yes'|trans({'%count%':events[event_const('TYPE_TAGS_PROPOSED')].count}, 'users') }}{% endif %}"
+            class="view_follows_event"
+          >
+            <img src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags" />
+            <span class="new_follows">{{ events[event_const('TYPE_TAGS_PROPOSED')].count }}</span>
+          </a>
+        {% else %}
+          <img title="{{ 'events.new_tags.no'|trans({}, 'users') }}" src="{{ asset('bundles/muzichcore/img/1333484018_rss-tag.png') }}" alt="tags" />
+          <span class="new_follows">0</span>
+        {% endif %}
+          
+    </div>
   
   
   </div>

web/bundles/muzichcore/css/main.css

@@ -1168,6 +1168,18 @@ div#events div.follows span
   margin-left: 5px;
 }
 
+div#events div.tags img
+{
+  margin-left: 3px;
+  margin-bottom: -2px;
+}
+
+div#events div.tags span
+{
+  font-weight: bold;
+  margin-left: 5px;
+}
+
 /*
 * css mynetwork
 */

web/bundles/muzichcore/js/muzich.js

@@ -1685,7 +1685,7 @@ $(document).ready(function(){
   
   
   // Enlever les ids du ElementSearch
-  $('div.more_filters a.new_comments, div.more_filters a.new_favorites').live('click', function(){
+  $('div.more_filters a.new_comments, div.more_filters a.new_favorites, div.more_filters a.tags').live('click', function(){
     
     $('img.elements_more_loader').show();
     $('ul.elements').html('');

web/bundles/muzichhome/css/home.css

@@ -94,7 +94,16 @@ div.more_filters a.new_favorites
   background-position: 2px 3px;
 }
 
-div.more_filters a.new_comments img, div.more_filters a.new_favorites img
+div.more_filters a.new_tags
+{
+  margin-top: 5px;
+  padding-left: 20px;
+  background-image: url(/bundles/muzichcore/img/1333484018_rss-tag.png);
+  background-repeat: no-repeat;
+  background-position: 2px 3px;
+}
+
+div.more_filters a.new_comments img, div.more_filters a.new_favorites img, div.more_filters a.new_tags img
 {
   margin-bottom: -3px;
 }