Fixed section controller

Author: gorriecoe

_config/config.yml

@@ -11,7 +11,7 @@ ContentController:
   extensions:
     - SectionContentControllerExtension
   url_handlers:
-    'section/$ID!': 'handleSection'
+    'section/$SECTIONNAME!/$ACTION!': 'handleSection'
 Injector:
   GridField:
     class: RowExtraClassesGridField

code/controllers/Section_Controller.php

@@ -16,7 +16,8 @@ public function __contruct($section = null)
              $this->section = $section;
              $this->failover = $section;
          }
-
+         $this->CurrentPage = Controller::curr();
+         Debug::dump($section);
          parent::__contruct();
      }
 
@@ -39,13 +40,15 @@ public function Link($action = null)
         }
         return Controller::curr()->Link($segment);
     }
+
     /**
-     * @return string - link to page this section is on
+     * Access current page scope from section templates with $CurrentPage
+     *
+     * @return Controller
      */
-    public function pageLink()
+    public function getCurrentPage()
     {
-        $parts = explode('/section/', $this->Link());
-        return isset($parts[0]) ? $parts[0] : null;
+        return Controller::curr();
     }
 
      public function getSection()

code/extensions/SectionContentControllerExtension.php

@@ -10,15 +10,18 @@ class SectionContentControllerExtension extends Extension {
 
     /**
      * Handles section attached to a page
-     * Assumes URLs in the following format: <URLSegment>/section/<section-ID>.
+     * Assumes URLs in the following format: <URLSegment>/section/<section-id>.
      *
      * @return RequestHandler
      */
     public function handleSection() {
-        if ($id = $this->owner->getRequest()->param('ID')) {
+
+        if ($ClassName = $this->owner->getRequest()->param('SECTIONNAME')) {
             $sections = $this->owner->data()->Sections();
-            if ($section = $sections->find('ID', $id)) {
-                return $section->getController();
+            if ($section = $sections->filter(array('ClassName' => $ClassName))->first()) {
+                if ($action = $this->owner->getRequest()->param('ACTION')) {
+                    return $section->getController()->$action();
+                }
             }
         }
         // return $section->getController();

code/models/Section.php

@@ -286,12 +286,21 @@ public function Render(){
         );
     }
 
+    /**
+     * Access current page scope from section templates with $CurrentPage
+     *
+     * @return Controller
+     */
+    public function getCurrentPage()
+    {
+        return Controller::curr();
+    }
+
     public function Layout()
     {
         $member = Member::currentUser();
         $access = Permission::checkMember($member, 'CMS_ACCESS');
         if($this->Public || $access){
-            $this->CurrentPage = Controller::curr();
             return $this->renderWith($this->Render());
         }
     }