Anomalie #758: Suppression d'un element dans une playlist

src/Muzich/CoreBundle/Entity/Playlist.php

@@ -239,6 +239,19 @@ class Playlist
     $this->setElements($elements_manager->getContent());
   }
   
+  public function getElementIndex(Element $element)
+  {
+    $elements_manager = new ElementCollectionManager(json_decode($this->elements, true));
+    return $elements_manager->index($element);
+  }
+  
+  public function removeElementWithIndex($index)
+  {
+    $elements_manager = new ElementCollectionManager(json_decode($this->elements, true));
+    $elements_manager->removeWithIndex($index);
+    $this->setElements($elements_manager->getContent());
+  }
+  
   public function getElementsIds()
   {
     $elements_manager = new ElementCollectionManager(json_decode($this->elements, true));

src/Muzich/CoreBundle/Managers/PlaylistManager.php

@@ -185,6 +185,13 @@ class PlaylistManager
     $this->entity_manager->persist($playlist);
   }
   
+  public function removePlaylistElementWithIndex(Playlist $playlist, $index)
+  {
+    $playlist->removeElementWithIndex($index);
+    $this->actualizePlaylistTags($playlist);
+    $this->entity_manager->persist($playlist);
+  }
+  
   protected function actualizePlaylistTags(Playlist $playlist)
   {
     $tag_lib = new TagLib();

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

@@ -148,7 +148,7 @@ class PlaylistControllerTest extends FunctionalTest
   
   protected function checkReadPlaylist($playlist, $elements = null)
   {
-    $this->exist('h2:contains("'.$playlist->getName().'")');
+    $this->exist('h1:contains("'.$playlist->getName().'")');
     
     if ($elements !== null)
     {
@@ -364,7 +364,8 @@ class PlaylistControllerTest extends FunctionalTest
   
   protected function removeElementFromPlaylist($playlist, $element)
   {
-    $this->tests_cases->playlistremoveElement($playlist->getId(), $element->getId());
+    $index = $playlist->getElementIndex($element);
+    $this->tests_cases->playlistRemoveElement($playlist->getId(), $index);
   }
   
   public function testCopyWhenAddingElementToPickedPlaylist()

src/Muzich/CoreBundle/Tests/lib/Security/ContextTestCases.php

@@ -313,13 +313,13 @@ class ContextTestCases
     );
   }
   
-  public function playlistRemoveElement($playlist_id, $element_id)
+  public function playlistRemoveElement($playlist_id, $index)
   {
     return $this->getAjaxRequestContentResponse(
       'GET',
       $this->test->generateUrl('playlist_remove_element', array(
         'playlist_id' => $playlist_id,
-        'element_id'  => $element_id,
+        'index'       => $index,
         '_locale'     => 'fr',
         'token'       => $this->test->getToken()
       ))

src/Muzich/CoreBundle/lib/Collection/CollectionManager.php

@@ -70,6 +70,29 @@ abstract class CollectionManager
     $this->content = $new_content;
   }
   
+  public function removeWithIndex($index)
+  {
+    if (array_key_exists($index, $this->content))
+    {
+      unset($this->content[$index]);
+      $this->content = array_values($this->content);
+    }
+  }
+  
+  public function index($object)
+  {
+    $method_name = 'get' . $this->object_reference_attribute;
+    foreach ($this->content as $index => $content_line)
+    {
+      if ($object->$method_name() == $content_line[lcfirst($this->object_reference_attribute)])
+      {
+        return $index;
+      }
+    }
+    
+    return null;
+  }
+  
   public function removeWithReference($reference)
   {
     $new_content = array();

src/Muzich/PlaylistBundle/Controller/EditController.php

@@ -8,8 +8,6 @@ use Muzich\CoreBundle\Security\Context as SecurityContext;
 
 class EditController extends Controller
 {
-  
-  // TODO: Cette méthode ET les autres: Mettre à jour avec le gestionnaire d'accès (Security)
   public function updateOrderAction(Request $request, $playlist_id)
   {
     if (($uncondition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_PLAYLIST_UPDATE_ORDER)) !== false)
@@ -24,7 +22,7 @@ class EditController extends Controller
     return $this->jsonSuccessResponse();
   }
   
-  public function removeElementAction($playlist_id, $element_id)
+  public function removeElementAction($playlist_id, $index)
   {
     if (($uncondition = $this->userHaveNonConditionToMakeAction(SecurityContext::ACTION_PLAYLIST_REMOVE_ELEMENT)) !== false)
       return $this->jsonResponseError($uncondition);
@@ -33,7 +31,7 @@ class EditController extends Controller
     if (!$this->tokenIsCorrect() || !($playlist = $playlist_manager->findOwnedPlaylistWithId($playlist_id, $this->getUser())))
       return $this->jsonNotFoundResponse();
     
-    $playlist_manager->removePlaylistElementWithId($playlist, $element_id);
+    $playlist_manager->removePlaylistElementWithIndex($playlist, $index);
     $this->flush();
     return $this->jsonSuccessResponse();
   }

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

@@ -27,7 +27,7 @@ playlist_update_order:
   defaults: { _controller: MuzichPlaylistBundle:Edit:updateOrder }
 
 playlist_remove_element:
-  pattern: /ajax/playlist/element/remove/{playlist_id}/{element_id}/{token}
+  pattern: /ajax/playlist/element/remove/{playlist_id}/{index}/{token}
   defaults: { _controller: MuzichPlaylistBundle:Edit:removeElement }
 
 playlists_add_element_prompt:

src/Muzich/PlaylistBundle/Resources/views/Show/show.html.twig

@@ -33,10 +33,6 @@
     </div>
     
     <h1>{{ playlist.name }}</h1>
-    <!--
-    <a href="{{ path('playlists_user', { 'user_slug' : playlist.owner.slug }) }}">
-      {{ 'playlist.gotoplaylists'|trans({ '%user_username%' : playlist.owner.username }, 'elements') }}
-    </a>-->
     
     {% include "MuzichCoreBundle:Tag:tag_cloud.html.twig" with {
       'tags' : playlist.tags
@@ -76,7 +72,7 @@
                   {% if playlist.owned(app.user) %}
                     <a 
                       class="remove_element" 
-                      href="{{ path_token('playlist_remove_element', { 'playlist_id' : playlist.id, 'element_id' : element.id }) }}"
+                      href="{{ path_token('playlist_remove_element', { 'playlist_id' : playlist.id, 'index' : loop.index0 }) }}"
                       title="{{ 'playlist.remove_element'|trans({}, 'elements') }}"
                     >
                       <img src="{{ asset('/img/icon_close_2.png') }}" alt="delete" />
@@ -96,9 +92,7 @@
               </div>
               
               <div class="title">
-                <a class="title" href="{{ path('element_get_one', { 'element_id' : element.id }) }}" data-id="{{ element.id }}">
-                  {{ element.name }}
-                </a>
+                {{ element.name }}
               </div>
               
               <div class="content_opened"></div>