From ab8236da0f3646ce5762b25c26bc4fc4b314ed7f Mon Sep 17 00:00:00 2001
From: Tim Schumacher <tim@bandenkrieg.hacked.jp>
Date: Fri, 11 Jul 2014 20:21:47 +0200
Subject: [PATCH] Make the iCalendar work with the slugs.

---
 .../CalciferBundle/Controller/LocationController.php      | 8 ++++----
 .../Bundle/CalciferBundle/Controller/TagController.php    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php b/src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php
index 87f460d..32efe75 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php
+++ b/src/Hackspace/Bundle/CalciferBundle/Controller/LocationController.php
@@ -35,7 +35,7 @@ class LocationController extends Controller
     /**
      * Finds and displays a Event entity.
      *
-     * @Route("/{slug}", name="location_show")
+     * @Route("/{slug}(?!\.ics)", name="location_show")
      * @Method("GET")
      * @Template("CalciferBundle:Event:index.html.twig")
      */
@@ -79,12 +79,12 @@ class LocationController extends Controller
     /**
      * Finds and displays a Event entity.
      *
-     * @Route("/{id}.ics", requirements={"id" = "\d+"}, name="location_show_ics")
+     * @Route("/{slug}\.ics", name="location_show_ics")
      * @Method("GET")
      */
-    public function showActionICS($id)
+    public function showActionICS($slug)
     {
-        $results = $this->showAction(str_replace('.ics','',$id));
+        $results = $this->showAction(str_replace('.ics','',$slug));
         $entities = $results['entities'];
 
         $calendar = new Calendar();
diff --git a/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php b/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php
index 88261b8..b6128d9 100755
--- a/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php
+++ b/src/Hackspace/Bundle/CalciferBundle/Controller/TagController.php
@@ -35,7 +35,7 @@ class TagController extends Controller
     /**
      * Finds and displays a Event entity.
      *
-     * @Route("/{slug}", name="tag_show")
+     * @Route("/{slug}(?!\.ics)", name="tag_show")
      * @Method("GET")
      * @Template("CalciferBundle:Event:index.html.twig")
      */
@@ -76,12 +76,12 @@ class TagController extends Controller
     /**
      * Finds and displays a Event entity.
      *
-     * @Route("/{id}.ics", requirements={"id" = "\d+"}, name="tag_show_ics")
+     * @Route("/{slug}.ics", name="tag_show_ics")
      * @Method("GET")
      */
-    public function showActionICS($id)
+    public function showActionICS($slug)
     {
-        $results = $this->showAction(str_replace('.ics','',$id));
+        $results = $this->showAction(str_replace('.ics','',$slug));
         $entities = $results['entities'];
 
         $calendar = new Calendar();