AENV-540 - Make name/title field consistent for playlists api - impro…

…vements
sourcefabric · Oct 16, 2015 · 8bb5849 · 8bb5849
1 parent 978cfab
commit 8bb5849
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/newscoop/library/Newscoop/Entity/Playlist.php b/newscoop/library/Newscoop/Entity/Playlist.php
@@ -30,7 +30,7 @@ class Playlist extends AbstractEntity
      *
      * @var string
      */
-    protected $title;
+    protected $name;
 
     /**
      * @ORM\Column(length=1024, name="notes", nullable=true)
@@ -121,35 +121,43 @@ public function getArticlesLink()
     }
 
     /**
-     * Returns the title of the playlist.
+     * Returns the name of the playlist.
      */
     public function getName()
     {
-        return $this->title;
+        return $this->name;
     }
 
     /**
-     * Returns the title of the playlist.
+     * Returns the name of the playlist.
      *
      * @var string
      */
-    public function setName($title)
+    public function setName($name)
     {
-        $this->title = $title;
+        $this->name = $name;
 
         return $this;
     }
 
-    public function getTitle()
+    /**
+     * Returns the name of the playlist.
+     *
+     * @var string
+     */
+    public function setTitle($name)
     {
-        return $this->title;
+        $this->name = $name;
+
+        return $this;
     }
 
-    public function setTitle($title)
+    /**
+     * Returns the name of the playlist.
+     */
+    public function getTitle()
     {
-        $this->title = $title;
-
-        return $this;
+        return $this->name;
     }
 
     /**

diff --git a/newscoop/library/Newscoop/Entity/Repository/PlaylistRepository.php b/newscoop/library/Newscoop/Entity/Repository/PlaylistRepository.php
@@ -194,7 +194,6 @@ public function save(Playlist $playlist = null, $articles = null)
         $em->getConnection()->beginTransaction();
 
         try {
-
             $em->persist($playlist);
             if (is_null($playlist->getId())) {
                 $em->flush();

diff --git a/newscoop/src/Newscoop/GimmeBundle/Form/Type/PlaylistType.php b/newscoop/src/Newscoop/GimmeBundle/Form/Type/PlaylistType.php
@@ -16,7 +16,7 @@ class PlaylistType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('title', 'text', array(
+            ->add('name', 'text', array(
                 'required' => true,
             ))
             ->add('notes', 'text', array(

diff --git a/newscoop/src/Newscoop/GimmeBundle/Resources/config/serializer/newscoop/Playlist.yml b/newscoop/src/Newscoop/GimmeBundle/Resources/config/serializer/newscoop/Playlist.yml
@@ -7,12 +7,12 @@ Newscoop\Entity\Playlist:
             type: integer
             groups: ["list", "details"]
             serialized_name: id
-        title:
+        name:
             expose: true
             read_only: true
             type: string
             groups: ["list", "details"]
-            serialized_name: title
+            serialized_name: name
         notes:
             expose: true
             read_only: true

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/services/playlists.js b/newscoop/src/Newscoop/NewscoopBundle/Resources/public/js/playlists/services/playlists.js
@@ -39,6 +39,7 @@ angular.module('playlistsApp').factory('Playlist', [
             .success(function (response) {
                 if (response.items !== undefined) {
                     response.items.forEach(function (item) {
+                        item.title = item.name;
                         playlists.push(item);
                     });
 
@@ -278,7 +279,7 @@ angular.module('playlistsApp').factory('Playlist', [
 
             var formData = {
             	playlist: {
-            		title: playlist.title
+            		name: playlist.title
             	}
             };
 
@@ -347,7 +348,7 @@ angular.module('playlistsApp').factory('Playlist', [
 
             var formData = {
             	playlist: {
-            		title: playlist.title
+            		name: playlist.title
             	}
             };