fixs

src/Muzich/CoreBundle/Managers/PlaylistManager.php

@@ -247,4 +247,10 @@ class PlaylistManager
       ->findOneById($element_data['id']);
   }
   
+  public function getElementsObjects(Playlist $playlist)
+  {
+    return $this->entity_manager->getRepository('MuzichCoreBundle:Element')
+      ->findById($playlist->getElementsIds());
+  }
+  
 }

src/Muzich/CoreBundle/Propagator/EventElement.php

@@ -114,11 +114,12 @@ class EventElement extends EventPropagator
       $ur->addPoints($score_action);
       $element->addPoints($score_action);
       $element->increaseCountFavorited();
+      $this->getEntityManager()->persist($element);
     }
     
     $uea = new UserEventAction($element->getOwner(), $this->container);
     $event = $uea->proceed(Event::TYPE_FAV_ADDED_ELEMENT, $element->getId());
-    $this->container->get('doctrine')->getEntityManager()->persist($event);
+    $this->getEntityManager()->persist($event);
   }
   
   /**
@@ -136,6 +137,7 @@ class EventElement extends EventPropagator
       $ur->removePoints($score_action);
       $element->removePoints($score_action);
       $element->uncreaseCountFavorited();
+      $this->getEntityManager()->persist($element);
     }
   }
   
@@ -176,11 +178,14 @@ class EventElement extends EventPropagator
     ;
   }
   
-  public function removedFromPlaylist(Element $element, User $removed_by_user, Playlist $playlist)
+  public function removedFromPlaylist(Element $element, User $removed_by_user, Playlist $playlist, $persist_before = true)
   {
-    // On persiste les modifs pour compter correctement
-    $this->getEntityManager()->persist($playlist);
-    $this->getEntityManager()->flush();
+    if ($persist_before)
+    {
+      // On persiste les modifs pour compter correctement
+      $this->getEntityManager()->persist($playlist);
+      $this->getEntityManager()->flush();
+    }
     
     $ur = new UserReputation($element->getOwner());
     $security_context = new SecurityContext($removed_by_user);

src/Muzich/PlaylistBundle/Controller/EditController.php

@@ -32,7 +32,7 @@ class EditController extends Controller
     if (!$this->tokenIsCorrect() || !($playlist = $playlist_manager->findOwnedPlaylistWithId($playlist_id, $this->getUser())))
       return $this->jsonNotFoundResponse();
     
-    $element = $playlist_manager->getElementWithIndex($index);
+    $element = $playlist_manager->getElementWithIndex($playlist, $index);
     $playlist_manager->removePlaylistElementWithIndex($playlist, $index);
     
     $event = new EventElement($this->container);
@@ -56,7 +56,7 @@ class EditController extends Controller
     $playlist_manager->addElementToPlaylist($element, $playlist);
     
     $event = new EventElement($this->container);
-    $event->addedFromPlaylist($element, $this->getUser(), $playlist);
+    $event->addedToPlaylist($element, $this->getUser(), $playlist);
     
     $this->persist($element);
     $this->flush();
@@ -78,7 +78,7 @@ class EditController extends Controller
       $this->getPlaylistManager()->addElementToPlaylist($element, $form->getData());
       
       $event = new EventElement($this->container);
-      $event->addedFromPlaylist($element, $this->getUser(), $form->getData());
+      $event->addedToPlaylist($element, $this->getUser(), $form->getData());
 
       $this->persist($element);
       $this->flush();
@@ -109,7 +109,7 @@ class EditController extends Controller
     $this->getPlaylistManager()->removePickedPlaylistToUser($this->getUser(), $playlist);
     
     $event = new EventElement($this->container);
-    $event->addedFromPlaylist($element, $this->getUser(), $new_playlist);
+    $event->addedToPlaylist($element, $this->getUser(), $new_playlist);
     
     $this->persist($element);
     $this->flush();