Evolution #777: Modification d'une playlist

app/Resources/translations/elements.fr.yml

@@ -141,3 +141,7 @@ playlist:
                           Pour ajouter de la musique a vos listes de lectures vous devez utiliser
                           les boutons disponibles en haut à droite des partages. Vous pourrez ensuite
                           choisir a quelle liste ajouter la musique en question.
+  edit:                  Modifier
+  update_submit:         Mettre à jour
+  goback:                Retour
+  edit_title:            Modification de "%playlist_name%"

app/Resources/translations/flash.fr.yml

@@ -51,4 +51,6 @@ presubscription:
 
 playlist:
   delete:
-    success:       Playlist supprimée
+    success:       Playlist supprimée
+  update:
+    success:       La liste de lecture a été mise à jour

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

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

src/Muzich/CoreBundle/Resources/public/css/main.css

@@ -2402,6 +2402,18 @@ ul.playlists_for_element li.in
   list-style-image: url(/img/in.png);
 }
 
+form.playlist_edit input#playlist_name
+{
+  width: 600px;
+}
+
+form.playlist_edit input[type="submit"]
+{
+  float: right;
+  margin-right: 10px;
+  margin-top: 5px;
+}
+
 /*
 *
 *

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

@@ -461,4 +461,39 @@ class PlaylistControllerTest extends FunctionalTest
     $this->isResponseSuccess();
   }
   
+  public function testUpdate()
+  {
+     $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())));
+    $this->checkReadPlaylist($this->playlists['bux_1_pub']);
+    $new_name = $this->playlists['bux_1_pub']->getName().' dans tes oreilles ?!';
+    $this->playlists['bux_1_pub']->setName($new_name);
+    $this->updatePlaylist($this->playlists['bux_1_pub']);
+    $this->checkPlaylistName($this->playlists['bux_1_pub'], $new_name);
+    $this->goToPage($this->generateUrl('playlist', array('user_slug' => $this->users['bux']->getSlug(), 'playlist_id' => $this->playlists['bux_1_pub']->getId())));
+    $this->checkReadPlaylist($this->playlists['bux_1_pub']);
+  }
+  
+  protected function updatePlaylist($playlist)
+  {
+    $this->goToPage($this->generateUrl('playlist_edit', array(
+      'user_slug' => $playlist->getOwner()->getSlug(),
+      'playlist_id' => $playlist->getId()
+    )));
+    $this->isResponseSuccess();
+    $this->exist('form.playlist_edit');
+    
+    $form = $this->selectForm('form.playlist_edit input[type="submit"]');
+    $form['playlist[name]'] = $playlist->getName();
+    $this->submit($form);
+  }
+  
+  protected function checkPlaylistName($playlist, $name)
+  {
+    $playlist_in_database = $this->findOneBy('Playlist', $name);
+    $this->assertTrue(!is_null($playlist_in_database));
+  }
+  
 }

src/Muzich/CoreBundle/lib/Controller.php

@@ -12,6 +12,7 @@ use Muzich\CoreBundle\Searcher\GlobalSearcher;
 use Muzich\CoreBundle\Entity\Element;
 use Muzich\CoreBundle\Entity\Presubscription;
 use Muzich\CoreBundle\Entity\User;
+use Muzich\CoreBundle\Entity\Playlist;
 use Muzich\CoreBundle\Security\Context as SecurityContext;
 use Muzich\CoreBundle\Managers\PlaylistManager;
 use Muzich\CoreBundle\Form\Playlist\PlaylistForm;
@@ -680,9 +681,12 @@ class Controller extends BaseController
       ->findOneById($element_id);
   }
   
-  protected function getPlaylistForm()
+  protected function getPlaylistForm(Playlist $playlist = null)
   {
-    return $this->createForm(new PlaylistForm(), $this->getPlaylistManager()->getNewPlaylist($this->getUserOrNullIfVisitor()));
+    if (!$playlist)
+      $playlist = $this->getPlaylistManager()->getNewPlaylist($this->getUserOrNullIfVisitor());
+    
+    return $this->createForm(new PlaylistForm(), $playlist);
   }
   
   protected function tokenIsCorrect($intention = '')

src/Muzich/PlaylistBundle/Controller/EditController.php

@@ -156,4 +156,43 @@ class EditController extends Controller
     return $this->redirect($this->generateUrl('playlists_user', array('user_slug' => $this->getUser()->getSlug())));
   }
   
+  public function editAction($playlist_id)
+  {
+    if (!($playlist = $this->getPlaylistManager()->findOwnedPlaylistWithId($playlist_id, $this->getUser())))
+      throw $this->createNotFoundException();
+    
+    return $this->render('MuzichPlaylistBundle:Edit:edit.html.twig', array(
+      'form'          => $this->getPlaylistForm($playlist)->createView(),
+      'playlist'      => $playlist,
+      'playlist_name' => $playlist->getName()
+    ));
+  }
+  
+  public function updateAction(Request $request, $playlist_id)
+  {
+    if (!($playlist = $this->getPlaylistManager()->findOwnedPlaylistWithId($playlist_id, $this->getUser())))
+      throw $this->createNotFoundException();
+    
+    $playlist_name = $playlist->getName();
+    $form = $this->getPlaylistForm($playlist);
+    $form->bind($request);
+    if ($form->isValid())
+    {
+      $this->persist($form->getData());
+      $this->flush();
+      
+      $this->setFlash('success', 'playlist.update.success');
+      return $this->redirect($this->generateUrl('playlist', array(
+        'user_slug'   => $playlist->getOwner()->getSlug(),
+        'playlist_id' => $playlist->getId()
+      )));
+    }
+    
+    return $this->render('MuzichPlaylistBundle:Edit:edit.html.twig', array(
+      'form'          => $form->createView(),
+      'playlist'      => $playlist,
+      'playlist_name' => $playlist_name
+    ));
+  }
+  
 }

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

@@ -6,6 +6,14 @@ playlist:
   pattern: /user/{user_slug}/playlist/{playlist_id}
   defaults: { _controller: MuzichPlaylistBundle:Show:show }
 
+playlist_edit:
+  pattern: /user/{user_slug}/playlist/{playlist_id}/edit
+  defaults: { _controller: MuzichPlaylistBundle:Edit:edit }
+  
+playlist_update:
+  pattern: /user/{user_slug}/playlist/{playlist_id}/update
+  defaults: { _controller: MuzichPlaylistBundle:Edit:update }
+
 playlist_delete:
   pattern: /playlist/delete/{playlist_id}/{token}
   defaults: { _controller: MuzichPlaylistBundle:Edit:delete }

src/Muzich/PlaylistBundle/Resources/views/Edit/edit.html.twig

@@ -0,0 +1,36 @@
+{% extends "MuzichFavoriteBundle::layout.html.twig" %}
+
+{% block title %}{{ 'playlist.edit_title'|trans({'%playlist_name%' : playlist_name}, 'elements') }}{% endblock %}
+{% block mainbox_classes %}{% endblock %}
+
+{% block content %}
+  
+  <div class="top_tools">
+    <div class="show_options">
+      
+      <a class="button darkbutton" href="{{ path('playlist', {
+        'user_slug' : playlist.owner.slug,
+        'playlist_id' : playlist.id}
+      ) }}" >
+        {{ 'playlist.goback'|trans({}, 'elements') }}
+      </a>
+      
+    </div>
+    
+    <h1>
+        {{ 'playlist.edit_title'|trans({'%playlist_name%' : playlist_name}, 'elements') }}
+    </h1>
+    
+    <form class="playlist_edit" action="{{ path('playlist_update', {
+      'user_slug' : playlist.owner.slug,
+      'playlist_id' : playlist.id
+    }) }}" method="post">
+      {% include 'MuzichPlaylistBundle:Show:form.html.twig' with {
+        'display_public_widget' : false,
+        'submit_value'          : 'playlist.update_submit'|trans({}, 'elements')
+      } %}
+    </form>
+  
+  </div>
+  
+{% endblock %}

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

@@ -1,14 +1,20 @@
+{% if submit_value is not defined %}
+  {% set submit_value = 'playlist.create_submit'|trans({}, 'elements') %}
+{% endif %}
+
 {{ form_errors(form) }}
 {{ form_errors(form.name) }}
-{{ form_errors(form.public) }}
 
-{{ form_widget(form.public) }}
-<label for="playlist_public">{{ 'playlist.public_label'|trans({}, 'elements') }}</label>
-  
+{% if display_public_widget %}
+  {{ form_errors(form.public) }}
+  {{ form_widget(form.public) }}
+  <label for="playlist_public">{{ 'playlist.public_label'|trans({}, 'elements') }}</label>
+{% endif %}
+
 <div class="field">
   {{ form_widget(form.name, {'attr':{'class':'niceinput'}}) }}
-  <input class="niceinput" type="submit" value="{{ 'playlist.create_submit'|trans({}, 'elements') }}" />
+  <input class="niceinput" type="submit"
+    value="{{ submit_value }}" />
 </div>
 
-
 {{ form_rest(form) }}

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

@@ -6,7 +6,9 @@
 <div class="create_playlist">
   <h2 class="nomargintop">{{ 'playlist.create_and_add'|trans({}, 'elements') }}</h2>
   <form action="{{ path('playlist_add_element_and_create', { 'element_id' : element_id }) }}" method="post">
-    {% include 'MuzichPlaylistBundle:Show:form.html.twig' %}
+    {% include 'MuzichPlaylistBundle:Show:form.html.twig' with {
+      'display_public_widget' : true
+    } %}
   </form>
 </div>
 

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

@@ -33,16 +33,30 @@
     </div>
     
     <h1>
+      {% if app.user %}
+        {% if playlist.owned(app.user) %}
+          <a
+             href="{{ path('playlist_edit', { 'user_slug' : playlist.owner.slug, 'playlist_id' : playlist.id }) }}"
+             title="{{ 'playlist.edit'|trans({}, 'elements') }}"
+          >
+            <img src="{{ asset('/img/icon_pen_black.png') }}" alt="edit" />
+          </a>
+        {% endif %}
+      {% endif %}
+        
       {{ playlist.name }}
       {% if playlist.public %}
         {{ 'playlist.public_word'|trans({}, 'elements') }}
       {% endif %}
     </h1>
     
-    {% if playlist.owned(app.user) %}
-      <p>{{ 'playlist.how_add_element'|trans({}, 'elements') }}</p>
+    {% if app.user %}
+      {% if playlist.owned(app.user) %}
+        <p>{{ 'playlist.how_add_element'|trans({}, 'elements') }}</p>
+      {% endif %}
     {% endif %}
     
+    
     {% include "MuzichCoreBundle:Tag:tag_cloud.html.twig" with {
       'tags' : playlist.tags
     } %}