Evolution #807: Rendre ou enlever "public" de sa playlist

src/Muzich/CoreBundle/Form/Playlist/PlaylistForm.php

@@ -14,12 +14,9 @@ class PlaylistForm extends AbstractType
       'required' => true,
     ));
     
-    if (!$options['data']->getId())
-    {
-      $builder->add('public', 'checkbox', array(
-        'required' => false,
-      ));
-    }
+    $builder->add('public', 'checkbox', array(
+      'required' => false,
+    ));
   }
 
   public function getName()

src/Muzich/CoreBundle/Managers/PlaylistManager.php

@@ -135,26 +135,12 @@ class PlaylistManager
     $playlist_copied = new Playlist();
     $playlist_copied->setOwner($user);
     $playlist_copied->setName($playlist->getName());
-    $playlist_copied->setPublic(true);
+    $playlist_copied->setPublic(false);
     $playlist_copied->setTags($playlist->getTags());
     $playlist_copied->setElements($playlist->getElements());
     $playlist_copied->setCopied($playlist);
     $playlist->addCopy($playlist_copied);
-    
-    //foreach ($user->getPlaylistsOwneds() as $fuck)
-    //{
-    //  var_dump($fuck->getName());
-    //}
-    //
     $user->getPlaylistsOwneds()->add($playlist_copied);
-    //
-    //var_dump($playlist_copied->getOwner()->getUsername());
-    //
-    //foreach ($user->getPlaylistsOwneds() as $fuck)
-    //{
-    //  var_dump($fuck->getName());
-    //}
-    //die();
     
     $this->entity_manager->persist($playlist_copied);
     $this->entity_manager->persist($user);
@@ -246,4 +232,11 @@ class PlaylistManager
     }
   }
   
+  public function privatizePlaylist(Playlist $playlist)
+  {
+    $this->copyPlaylistForPickedUsers($playlist);
+    $playlist->setPublic(false);
+    $this->entity_manager->persist($playlist);
+  }
+  
 }

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

@@ -403,7 +403,7 @@ class PlaylistControllerTest extends FunctionalTest
   
   protected function checkPlaylistOwnedBy($playlist, $user)
   {
-    $this->assertEquals($playlist->getOwner()->getId(), $user->getId());
+    $this->assertEquals($playlist->getOwner()->getUsername(), $user->getUsername());
   }
   
   protected function checkPlaylistNotOwnedBy($playlist, $user)
@@ -425,6 +425,26 @@ class PlaylistControllerTest extends FunctionalTest
     $this->checkPlaylistOwnedBy($this->playlists['bux_bob_pub'], $this->users['bux']);
   }
   
+  public function testCopyWhenPickedPlaylistPrivatized()
+  {
+    $this->init();
+    $this->initCopysContextData();
+    $this->connectUser('bob', 'toor');
+    
+    $this->checkPlaylistPickedBy($this->playlists['bob_pub'], $this->users['bux']);
+    $this->checkPlaylistNotOwnedBy($this->playlists['bob_pub'], $this->users['bux']);
+    
+    $this->playlists['bob_pub']->setPublic(false);
+    $this->updatePlaylist($this->playlists['bob_pub']);
+    $this->playlists['bux_bob_pub'] = $this->findOneBy('Playlist', array(
+      'name' => 'A travers l\'espace',
+      'owner' => $this->users['bux']->getId()
+    ));
+    $this->assertTrue(!is_null($this->playlists['bux_bob_pub']));
+    $this->assertEquals(false, $this->playlists['bux_bob_pub']->isPublic());
+    $this->checkPlaylistOwnedBy($this->playlists['bux_bob_pub'], $this->users['bux']);
+  }
+  
   protected function deletePlaylist($playlist)
   {
     $this->tests_cases->playlistDelete($playlist->getId());
@@ -463,7 +483,7 @@ class PlaylistControllerTest extends FunctionalTest
   
   public function testUpdate()
   {
-     $this->init();
+    $this->init();
     $this->initReadContextData();
     $this->connectUser('bux', 'toor');
     $this->goToPage($this->generateUrl('playlist', array('user_slug' => $this->users['bux']->getSlug(), 'playlist_id' => $this->playlists['bux_1_pub']->getId())));
@@ -487,6 +507,7 @@ class PlaylistControllerTest extends FunctionalTest
     
     $form = $this->selectForm('form.playlist_edit input[type="submit"]');
     $form['playlist[name]'] = $playlist->getName();
+    $form['playlist[public]'] = $playlist->isPublic();
     $this->submit($form);
   }
   

src/Muzich/PlaylistBundle/Controller/EditController.php

@@ -174,10 +174,16 @@ class EditController extends Controller
       throw $this->createNotFoundException();
     
     $playlist_name = $playlist->getName();
+    $playlist_public = $playlist->isPublic();
     $form = $this->getPlaylistForm($playlist);
     $form->bind($request);
     if ($form->isValid())
     {
+      if ($playlist_public && !$playlist->isPublic())
+      {
+        $this->getPlaylistManager()->privatizePlaylist($playlist);
+      }
+      
       $this->persist($form->getData());
       $this->flush();
       

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

@@ -5,11 +5,9 @@
 {{ form_errors(form) }}
 {{ form_errors(form.name) }}
 
-{% if display_public_widget %}
-  {{ form_errors(form.public) }}
-  {{ form_widget(form.public) }}
-  <label for="playlist_public">{{ 'playlist.public_label'|trans({}, 'elements') }}</label>
-{% endif %}
+{{ form_errors(form.public) }}
+{{ form_widget(form.public) }}
+<label for="playlist_public">{{ 'playlist.public_label'|trans({}, 'elements') }}</label>
 
 <div class="field">
   {{ form_widget(form.name, {'attr':{'class':'niceinput'}}) }}