remove broken upgrade script, improve errors handling in publication …

…edit form
sourcefabric · Nov 20, 2015 · 6864636 · 6864636
1 parent 456fdbc
commit 6864636
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/newscoop/install/Resources/sql/upgrade/4.4.x/2015.10.29/data-required.sql b/newscoop/install/Resources/sql/upgrade/4.4.x/2015.10.29/data-required.sql
diff --git a/newscoop/library/Newscoop/Services/PlaylistsService.php b/newscoop/library/Newscoop/Services/PlaylistsService.php
@@ -205,24 +205,25 @@ public function checkIfThemePlaylistsAreUpToDate($theme, $themePlaylists)
     public function updateThemePlaylists($theme, $themePlaylists)
     {
         $newThemePlaylists = $this->buildNewThemePlaylists($themePlaylists);
+        if (is_array($newThemePlaylists)) {
+            foreach ($newThemePlaylists as $playlistName => $themePlaylist) {
+                $playlist = $this->em->getRepository('Newscoop\Entity\Playlist')->getPlaylistByTitle($playlistName)->getOneOrNullResult();
+                if (!$playlist) {
+                    $playlist = new Playlist();
+                    $playlist->setName($playlistName);
+
+                    $this->em->persist($playlist);
+                }
 
-        foreach ($newThemePlaylists as $playlistName => $themePlaylist) {
-            $playlist = $this->em->getRepository('Newscoop\Entity\Playlist')->getPlaylistByTitle($playlistName)->getOneOrNullResult();
-            if (!$playlist) {
-                $playlist = new Playlist();
-                $playlist->setName($playlistName);
+                $themes = $playlist->getThemes();
+                $themes[$theme->getId()] = $themePlaylist['templates'];
 
-                $this->em->persist($playlist);
+                $playlist->setThemes($themes);
             }
 
-            $themes = $playlist->getThemes();
-            $themes[$theme->getId()] = $themePlaylist['templates'];
-
-            $playlist->setThemes($themes);
+            $this->em->flush();
         }
 
-        $this->em->flush();
-
         return true;
     }
 

diff --git a/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PublicationType.php b/newscoop/src/Newscoop/NewscoopBundle/Form/Type/PublicationType.php
@@ -65,8 +65,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'output' => 1,
                         'publication' => $options['publication']->getId(),
                         'language' => $language,
-                    )
-                );
+                    ));
 
                 $frontThemeChoices = array('0' => 'publications.form_type.label.follow_current_issue_theme');
                 $choosedTheme = 0;