remove publication aliases on publication removal, don't set publicat…

…ion in listener when not exist and is still attached to alias
sourcefabric · Jan 26, 2016 · aa9821b · aa9821b
1 parent 7a4c19f
commit aa9821b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/newscoop/library/Newscoop/Services/PublicationService.php b/newscoop/library/Newscoop/Services/PublicationService.php
@@ -162,7 +162,7 @@ public function publicationResolver(Request $request)
         }
 
         if (empty($alias)) {
-            return null;
+            return;
         }
 
         $this->publicationMetadata['alias'] = array(
@@ -185,10 +185,10 @@ public function publicationResolver(Request $request)
          */
         $request->attributes->set('_newscoop_publication_metadata', $this->publicationMetadata);
         $aliasObject = $this->em->getReference('Newscoop\Entity\Aliases', $alias[0]['aliasId']);
-        $publicationObject = $this->em->getReference('Newscoop\Entity\Publication', $alias[0]['publicationId']);
         $this->setPublicationAlias($aliasObject);
-        $this->setPublication($publicationObject);
-
-        return $publicationObject;
+        if ($alias[0]['publicationId'] != null) {
+            $publicationObject = $this->em->getReference('Newscoop\Entity\Publication', $alias[0]['publicationId']);
+            $this->setPublication($publicationObject);
+        }
     }
 }
diff --git a/newscoop/src/Newscoop/NewscoopBundle/Controller/BackendPublicationsController.php b/newscoop/src/Newscoop/NewscoopBundle/Controller/BackendPublicationsController.php
@@ -149,6 +149,10 @@ public function removeAction(Request $request, Publication $publication)
         if ($request->getMethod() === 'POST' && $issuesRemaining == 0 && $sectionsRemaining == 0 && $articlesRemaining == 0) {
             $form->handleRequest($request);
             if ($form->isValid()) {
+                // unassign publication from aliases
+                $dql = "DELETE FROM Newscoop\Entity\Aliases as a WHERE a.publication = :publication";
+                $em->createQuery($dql)->setParameters(array('publication' => $publication))->getResult();
+
                 $em->remove($publication);
                 $em->flush();