CS-5630: Moves admin interface check to IssueListener from IssueService

sourcefabric · Jan 14, 2015 · b9cdf3c · b9cdf3c
1 parent 8323e7f
commit b9cdf3c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/newscoop/library/Newscoop/Services/IssueService.php b/newscoop/library/Newscoop/Services/IssueService.php
@@ -97,8 +97,7 @@ public function issueResolver(Request $request)
         $uriParts = array_filter(explode('/', $request->getRequestUri()));
         $uriPartsCount = count($uriParts);
         $issue = null;
-        // Don't try to resolve issues for the admin interface
-        if (!in_array('admin', $uriParts) && $uriPartsCount >= 2 && $uriPartsCount <= 5) {
+        if ($uriPartsCount >= 2 && $uriPartsCount <= 5) {
             $publication = $this->publicationService->getPublication();
             $cacheKey = $this->cacheService->getCacheKey(array(
                 'resolver',

diff --git a/newscoop/src/Newscoop/NewscoopBundle/EventListener/IssueListener.php b/newscoop/src/Newscoop/NewscoopBundle/EventListener/IssueListener.php
@@ -41,6 +41,9 @@ public function __construct(IssueService $issueService)
      */
     public function onRequest(GetResponseEvent $event)
     {
-        $this->issueService->issueResolver($event->getRequest());
+        $onAdminInterface = strpos($event->getRequest()->getRequestUri(), '/admin');
+        if ($onAdminInterface === false) {
+            $this->issueService->issueResolver($event->getRequest());
+        }
     }
 }