Browse Source

Evolution #387: Ordre des tags

Sevajol Bastien 12 years ago
parent
commit
6d31fbeb64

+ 15 - 2
src/Muzich/CoreBundle/Controller/ElementController.php View File

215
       $em->persist($element->getOwner());
215
       $em->persist($element->getOwner());
216
       $em->remove($element);
216
       $em->remove($element);
217
       
217
       
218
+      /**
219
+      * Bug lors des tests: L'user n'est pas 'lié' a celui en base par doctrine.
220
+      * Docrine le voit si on faire une requete directe.
221
+      */
222
+      $user = $this->getUser();
223
+      if ($this->container->getParameter('env') == 'test')
224
+      {
225
+        $user = $this->getDoctrine()->getRepository('MuzichCoreBundle:User')->findOneById(
226
+          $this->container->get('security.context')->getToken()->getUser()->getId(),
227
+          array()
228
+        )->getSingleResult();
229
+      }
230
+      
218
       // On signale que cet user a modifié ses diffusions
231
       // On signale que cet user a modifié ses diffusions
219
-      $this->getUser()->setData(User::DATA_DIFF_UPDATED, true);
220
-      $em->persist($this->getUser());
232
+      $user->setData(User::DATA_DIFF_UPDATED, true);
233
+      $em->persist($user);
221
       
234
       
222
       $em->flush();
235
       $em->flush();
223
       
236
       

+ 1 - 1
src/Muzich/CoreBundle/Tests/Tag/TagReadTest.php View File

7
 use Muzich\CoreBundle\lib\Tag as TagLib;
7
 use Muzich\CoreBundle\lib\Tag as TagLib;
8
 
8
 
9
 class TagReadTest extends UnitTest
9
 class TagReadTest extends UnitTest
10
-{  
10
+{
11
   private function getTagsNames($response = array())
11
   private function getTagsNames($response = array())
12
   {
12
   {
13
     if (count($response))
13
     if (count($response))