Evolution #567: Pouvoir exclure des partages de son groupe

app/Resources/translations/elements.fr.yml

@@ -32,6 +32,13 @@ element:
       sentence:         Vraiment supprimer ?
       yes:              Oui
       no:               Non
+  group:
+    remove_from:
+      title:            Retirer du groupe %group_name%
+      confirm:
+        title:          Retirer du groupe ?
+        yes:            Oui
+        no:             Non
   tag:
     addtofav:
       title:            Ajouter a vos tags favoris

src/Muzich/CoreBundle/Controller/ElementController.php

@@ -1167,4 +1167,29 @@ class ElementController extends Controller
     ));
   }
   
+  public function removeFromGroupAction($group_id, $element_id, $token)
+  {
+    if (!($group = $this->getDoctrine()->getRepository('MuzichCoreBundle:Group')
+      ->findOneById($group_id))
+        || !($element = $this->getDoctrine()->getRepository('MuzichCoreBundle:Element')
+      ->findOneById($element_id)))
+    {
+      return $this->jsonNotFoundResponse();
+    }
+    
+    if ($token != $this->getUser()->getPersonalHash('remove_from_group_'.$element->getId())
+      || $group->getOwner()->getId() != $this->getUserId())
+    {
+      return $this->jsonNotFoundResponse();
+    }
+    
+    $element->setGroup(null);
+    $this->persist($element);
+    $this->flush();
+    
+    return $this->jsonResponse(array(
+      'status' => 'success'
+    ));
+  }
+  
 }

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

@@ -104,6 +104,10 @@ element_new_get:
   pattern: /ajax/element/new/get/{refid}
   defaults: { _controller: MuzichCoreBundle:Element:getNews, refid: null }
   
+element_remove_from_group:
+  pattern: /ajax/group/{group_id}/remove-element/{element_id}/{token}
+  defaults: { _controller: MuzichCoreBundle:Element:removeFromGroup }
+  
 ##
 
 ajax_tag_add_to_favorites:

src/Muzich/CoreBundle/Resources/public/js/muzich.js

@@ -11,7 +11,7 @@ var myMessages = ['info','warning','error','success']; // define the messages ty
 function hideAllMessages()
 {
   var messagesHeights = new Array(); // this array will store height for each
-	 
+  
  for (i=0; i<myMessages.length; i++)
  {
     messagesHeights[i] = $('.' + myMessages[i]).outerHeight();
@@ -639,7 +639,7 @@ $(document).ready(function(){
     
   }); 
   
- // Suppression d'un element
+  // Suppression d'un element
   $('a.element_remove_link').jConfirmAction({
     question : string_element_delete_confirm_sentence, 
     yesAnswer : string_element_delete_confirm_yes, 
@@ -678,6 +678,37 @@ $(document).ready(function(){
       li.find('a.element_edit_link').hide();
       li.find('a.element_remove_link').hide();
     }
+    
+    
+  });
+  
+  // Retrait d'un element d'un groupe
+  $('a.element_remove_from_group_link').jConfirmAction({
+    question : string_removefromgroup_sentence, 
+    yesAnswer : string_removefromgroup_confirm_yes, 
+    cancelAnswer : string_removefromgroup_confirm_no,
+    onYes: function(link){
+      
+      var li = link.parents('li.element');
+      li.find('img.element_loader').show();
+      $.getJSON(link.attr('href'), function(response){
+        if (response.status == 'mustbeconnected')
+        {
+          $(location).attr('href', url_index);
+        }
+        
+        if (response.status == 'success')
+        {
+          li.remove();
+        }
+        else
+        {
+          li.find('img.element_loader').hide();
+        }
+      });
+
+      return false;
+    }
   });
 
  var elements_edited = new Array();

src/Muzich/CoreBundle/Resources/views/Layout/head_js.html.twig

@@ -56,6 +56,9 @@
   {% autoescape false %}
   string_search_tag_title = "{{ 'search_tag.title'|trans({}, 'userui') }}";
   {% endautoescape %}
+  string_removefromgroup_sentence = "{{ 'element.group.remove_from.confirm.title'|trans({}, 'elements') }}";
+  string_removefromgroup_confirm_yes = "{{ 'element.group.remove_from.confirm.yes'|trans({}, 'elements') }}";
+  string_removefromgroup_confirm_no = "{{ 'element.group.remove_from.confirm.no'|trans({}, 'elements') }}";
 
   url_index = "{{ path('index') }}";
   url_search_tag = "{{ path('search_tag') }}";

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

@@ -7,6 +7,9 @@
 {% if display_comments is not defined %}
   {% set display_comments = true %}
 {% endif %}
+{% if his_group is not defined %}
+  {% set his_group = false %}
+{% endif %}
 
 <table>
   <tr>
@@ -152,6 +155,19 @@
 
         {% endif %}
         
+        {% if his_group %}
+          <li class="remove_from_group">
+            <a title="{{ 'element.group.remove_from.title'|trans({'%group_name%':group.name}, 'elements') }}"
+              class="element_remove_from_group_link"
+              href="{{ path('element_remove_from_group', {
+                 'element_id' : element.id,
+                 'group_id'   : group.id,
+                 'token'      : app.user.getPersonalHash('remove_from_group_'~element.id)
+              })  }}">
+              <img src="{{ asset('/img/1360779431_Remove_gray.png') }}" alt="remove from group" />
+            </a>
+          </li>
+        {% endif %}
       </ul>
       
       <span class="element_name">

src/Muzich/CoreBundle/Tests/Controller/GroupControllerTest.php

@@ -231,4 +231,113 @@ class GroupControllerTest extends FunctionalTest
     $this->exist('h1:contains("Les Fans de Psytrance")');
   }
   
+  public function testRemoveElementFromGroup()
+  {
+    $this->client = self::createClient();
+    $this->connectUser('bob', 'toor');
+    
+    // Elements que l'on va retirer pour le test
+    $element_1 = $this->findOneBy('Element', 'Infected mushroom - Muse Breaks');
+    $element_2 = $this->findOneBy('Element', 'Infected Mushroom - Psycho');
+    $element_3 = $this->findOneBy('Element', 'DUDELDRUM'); 
+    $group_fdp = $this->findOneBy('Group', 'Fans de psytrance');
+    $group_dud = $this->findOneBy('Group', 'DUDELDRUM');
+    
+    $this->assertTrue(!is_null($element_1));
+    $this->assertTrue(!is_null($element_2));
+    $this->assertTrue(!is_null($element_3));
+    
+    $this->assertTrue(!is_null($element_1->getGroup()));
+    $this->assertTrue(!is_null($element_2->getGroup()));
+    $this->assertTrue(!is_null($element_3->getGroup()));
+    
+    $this->assertEquals($group_fdp->getName(), $element_1->getGroup()->getName());
+    $this->assertEquals($group_fdp->getName(), $element_2->getGroup()->getName());
+    $this->assertEquals($group_dud->getName(), $element_3->getGroup()->getName());
+    
+    // On retire le premier element
+    $this->crawler = $this->client->request(
+      'POST', 
+      $this->generateUrl('element_remove_from_group', array(
+        'group_id'   => $group_fdp->getId(),
+        'element_id' => $element_1->getId(),
+        'token'      => $this->getUser()->getPersonalHash('remove_from_group_'.$element_1->getId())
+      )), 
+      array(), 
+      array(), 
+      array('HTTP_X-Requested-With' => 'XMLHttpRequest')
+    );
+    $this->isResponseSuccess();
+    $response = json_decode($this->client->getResponse()->getContent(), true);
+    $this->assertEquals($response['status'], 'success');
+    
+    $element_1 = $this->findOneBy('Element', 'Infected mushroom - Muse Breaks');
+    $element_2 = $this->findOneBy('Element', 'Infected Mushroom - Psycho');
+    $element_3 = $this->findOneBy('Element', 'DUDELDRUM'); 
+    
+    $this->assertTrue(!is_null($element_1));
+    $this->assertTrue(!is_null($element_2));
+    $this->assertTrue(!is_null($element_3));
+    
+    $this->assertTrue(is_null($element_1->getGroup()));
+    $this->assertTrue(!is_null($element_2->getGroup()));
+    $this->assertTrue(!is_null($element_3->getGroup()));
+    
+    // On retire le deuxieme element
+    $this->crawler = $this->client->request(
+      'POST', 
+      $this->generateUrl('element_remove_from_group', array(
+        'group_id'   => $group_fdp->getId(),
+        'element_id' => $element_2->getId(),
+        'token'      => $this->getUser()->getPersonalHash('remove_from_group_'.$element_2->getId())
+      )), 
+      array(), 
+      array(), 
+      array('HTTP_X-Requested-With' => 'XMLHttpRequest')
+    );
+    $this->isResponseSuccess();
+    $response = json_decode($this->client->getResponse()->getContent(), true);
+    $this->assertEquals($response['status'], 'success');
+    
+    $element_1 = $this->findOneBy('Element', 'Infected mushroom - Muse Breaks');
+    $element_2 = $this->findOneBy('Element', 'Infected Mushroom - Psycho');
+    $element_3 = $this->findOneBy('Element', 'DUDELDRUM'); 
+    
+    $this->assertTrue(!is_null($element_1));
+    $this->assertTrue(!is_null($element_2));
+    $this->assertTrue(!is_null($element_3));
+    
+    $this->assertTrue(is_null($element_1->getGroup()));
+    $this->assertTrue(is_null($element_2->getGroup()));
+    $this->assertTrue(!is_null($element_3->getGroup()));
+    
+    // On va maintenant essayer d'enlever un element d'un autre groupe, ce ne sera pas possible
+    $this->crawler = $this->client->request(
+      'POST', 
+      $this->generateUrl('element_remove_from_group', array(
+        'group_id'   => $group_dud->getId(),
+        'element_id' => $element_3->getId(),
+        'token'      => $this->getUser()->getPersonalHash('remove_from_group_'.$element_3->getId())
+      )), 
+      array(), 
+      array(), 
+      array('HTTP_X-Requested-With' => 'XMLHttpRequest')
+    );
+    $this->isResponseSuccess();
+    $response = json_decode($this->client->getResponse()->getContent(), true);
+    $this->assertEquals($response['status'], 'error');
+    
+    $element_1 = $this->findOneBy('Element', 'Infected mushroom - Muse Breaks');
+    $element_2 = $this->findOneBy('Element', 'Infected Mushroom - Psycho');
+    $element_3 = $this->findOneBy('Element', 'DUDELDRUM'); 
+    
+    $this->assertTrue(!is_null($element_1));
+    $this->assertTrue(!is_null($element_2));
+    $this->assertTrue(!is_null($element_3));
+    
+    $this->assertTrue(is_null($element_1->getGroup()));
+    $this->assertTrue(is_null($element_2->getGroup()));
+    $this->assertTrue(!is_null($element_3->getGroup()));
+  }
+  
 }

src/Muzich/CoreBundle/lib/Controller.php

@@ -350,6 +350,16 @@ class Controller extends BaseController
     return $response;
   }
   
+  protected function jsonNotFoundResponse()
+  {
+    $response = new Response(json_encode(array(
+      'status' => 'error',
+      'errors' => array('NotFound')
+    )));
+    $response->headers->set('Content-Type', 'application/json; charset=utf-8');
+    return $response;
+  }
+  
   /**
    * Permet d'utiliser la méthode Assert que l'on utilise dans les templates
    * afin d'avoir une url correcte vers une ressource web (img, js, ...)

src/Muzich/CoreBundle/lib/FunctionalTest.php

@@ -523,8 +523,12 @@ class FunctionalTest extends WebTestCase
    * @param array $params
    * @return object 
    */
-  protected function findOneBy($entityName, array $params)
+  protected function findOneBy($entityName, $params)
   {
+    if (!is_array($params))
+    {
+      $params = array('name' => $params);
+    }
     return $this->getEntityManager()->getRepository('MuzichCoreBundle:'.$entityName)
       ->findOneBy($params);
   }

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

@@ -78,7 +78,11 @@
     
   </div>
   
-  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {'no_group_name' : true} %}
+  {% include "MuzichCoreBundle:SearchElement:default.html.twig" with {
+    'no_group_name' : true,
+    'his_group'     : his_group,
+    'group'         : group
+  }%}
   
   {% if more_count is defined %} 
     {% if elements|length %}