Création de playlists en live

src/Muzich/CoreBundle/Entity/Playlist.php

@@ -54,7 +54,7 @@ class Playlist
   /**
    * @ORM\Column(type="boolean")
    */
-  protected $public = true;
+  protected $public = false;
   
   /**
    * @ORM\OneToMany(targetEntity="UserPlaylistPicked", mappedBy="user")

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

@@ -27,7 +27,7 @@ class PlaylistForm extends AbstractType
   {
     $resolver->setDefaults(array(
       'name'   => '',
-      'public' => true,
+      'public' => false,
     ));
   
     $resolver->setAllowedValues(array(

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

@@ -3141,19 +3141,9 @@ $(document).ready(function(){
     }
   });
   
-  $('html').click(function() {
-    if ($("div.playlists_prompt").is(':visible'))
-    {
-      $("div.playlists_prompt").hide();
-    }
-  });
-  $("div.playlists_prompt, div.playlists_prompt div, div.playlists_prompt a, div.playlists_prompt input").live('click', function(event){
-    event.stopPropagation();
-    $("div.playlists_prompt").show();
-  });
-  
   $('ul.elements a.add_to_playlist').live('click', function(event){
     
+    $('div.playlists_prompt').remove();
     var prompt = $('<div class="playlists_prompt"><img class="loader" src="/bundles/muzichcore/img/ajax-loader.gif" alt="loading..." /></div>');
     $('body').append(prompt);
     
@@ -3174,6 +3164,24 @@ $(document).ready(function(){
       if (response.status == 'success')
       {
         prompt.append(response.data);
+        prompt.find('div.create_playlist form').ajaxForm(function(response){
+          window.ResponseController.execute(
+            response,
+            function(){},
+            function(){}
+          );
+          
+          if (response.status == 'success')
+          {
+            $('div.playlists_prompt').remove();
+          }
+          
+          if (response.status == 'error')
+          {
+            prompt.find('div.create_playlist form').html(response.data);
+          }
+          
+        });
       }
       
     });

src/Muzich/CoreBundle/lib/Controller.php

@@ -14,6 +14,7 @@ use Muzich\CoreBundle\Entity\Presubscription;
 use Muzich\CoreBundle\Entity\User;
 use Muzich\CoreBundle\Security\Context as SecurityContext;
 use Muzich\CoreBundle\Managers\PlaylistManager;
+use Muzich\CoreBundle\Form\Playlist\PlaylistForm;
 
 class Controller extends BaseController
 {
@@ -679,4 +680,9 @@ class Controller extends BaseController
       ->findOneById($element_id);
   }
   
+  protected function getPlaylistForm()
+  {
+    return $this->createForm(new PlaylistForm(), $this->getPlaylistManager()->getNewPlaylist($this->getUserOrNullIfVisitor()));
+  }
+  
 }

src/Muzich/PlaylistBundle/Controller/EditController.php

@@ -44,4 +44,26 @@ class EditController extends Controller
     return $this->jsonSuccessResponse();
   }
   
+  public function addElementAndCreateAction(Request $request, $element_id)
+  {
+    if (!($element = $this->getElementWithId($element_id)))
+      return $this->jsonNotFoundResponse();
+    
+    $form = $this->getPlaylistForm();
+    $form->bind($request);
+    if ($form->isValid())
+    {
+      $this->getPlaylistManager()->addElementToPlaylist($element, $form->getData());
+      $this->flush();
+      return $this->jsonSuccessResponse();
+    }
+    
+    return $this->jsonResponseError('form_error',
+      $this->render('MuzichPlaylistBundle:Show:form.html.twig', array(
+        'form'       => $form->createView(),
+        'element_id' => $element_id
+      ))->getContent()
+    );
+  }
+  
 }

src/Muzich/PlaylistBundle/Controller/ShowController.php

@@ -5,7 +5,6 @@ namespace Muzich\PlaylistBundle\Controller;
 use Muzich\CoreBundle\lib\Controller;
 use Muzich\CoreBundle\Entity\Playlist;
 use Muzich\CoreBundle\lib\AutoplayManager;
-use Muzich\CoreBundle\Form\Playlist\PlaylistForm;
 
 class ShowController extends Controller
 {
@@ -59,9 +58,4 @@ class ShowController extends Controller
     );
   }
   
-  protected function getPlaylistForm()
-  {
-    return $this->createForm(new PlaylistForm(), $this->getPlaylistManager()->getNewPlaylist($this->getUserOrNullIfVisitor()));
-  }
-  
 }

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

@@ -28,5 +28,5 @@ playlists_add_element:
 
 playlist_add_element_and_create:
   pattern: /ajax/playlist/element/add-and-create/{element_id}
-  defaults: { _controller: MuzichPlaylistBundle:Edit:addElementAndcreate }
+  defaults: { _controller: MuzichPlaylistBundle:Edit:addElementAndCreate }
   

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

@@ -0,0 +1,12 @@
+{{ form_errors(form) }}
+{{ form_errors(form.name) }}
+{{ form_errors(form.public) }}
+
+<div class="field">
+  {{ form_widget(form.name, {'attr':{'class':'niceinput'}}) }}
+  {{ form_widget(form.public) }}
+</div>
+
+{{ form_rest(form) }}
+
+<input type="submit" value="CREATE" />

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

@@ -1,15 +1,7 @@
 
 <div class="create_playlist">
   <form action="{{ path('playlist_add_element_and_create', { 'element_id' : element_id }) }}" method="post">
-    
-    <div class="field">
-      {{ form_widget(form.name, {'attr':{'class':'niceinput'}}) }}
-      {{ form_widget(form.public) }}
-    </div>
-    
-    {{ form_rest(form) }}
-    
-    <input type="submit" value="CREATE" />
+    {% include 'MuzichPlaylistBundle:Show:form.html.twig' %}
   </form>
 </div>