Merge pull request #35 from Tom-Alexander/feature/parent-config-getter

UPDATE: Added array check
isobar-nz · Oct 24, 2015 · 261ed67 · 261ed67
2 parents 43fe8b1 + dda2b63
commit 261ed67
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/code/Extensions/CatalogDataObjectExtension.php b/code/Extensions/CatalogDataObjectExtension.php
@@ -52,7 +52,7 @@ public function updateCMSFields(FieldList $fields)
         $fields->removeByName('Version');
         $fields->removeByName('Versions');
 
-        $parentClass = $this->owner->stat('parentClass');
+        $parentClass = $this->getParentClasses();
 
         if ($pages = DataObject::get()->filter(array('ClassName' => array_values($parentClass)))) {
 
@@ -188,6 +188,22 @@ public function doUnpublish()
         return true;
     }
 
+    /**
+     * Returns the parent classes defined from the config as an array
+     * @return array
+     */
+    public function getParentClasses()
+    {
+        $parentClasses = $this->owner->stat('parentClass');
+
+        if(!is_array($parentClasses)) {
+            return array($parentClasses);
+        }
+
+        return $parentClasses;
+
+    }
+
     /**
      * Gets the fieldname for the sort column. Uses in owner's config for $sort_column
      *

diff --git a/code/Extensions/CatalogPageExtension.php b/code/Extensions/CatalogPageExtension.php
@@ -56,7 +56,7 @@ public function isPublishedNice()
      */
     public function updateCMSFields(FieldList $fields)
     {
-        $parentClass = $this->owner->stat('parentClass');
+        $parentClass = $this->getParentClasses();
 
         if ($pages = $this->getCatalogParents()) {
 
@@ -76,6 +76,22 @@ public function updateCMSFields(FieldList $fields)
         }
     }
 
+    /**
+     * Returns the parent classes defined from the config as an array
+     * @return array
+     */
+    public function getParentClasses()
+    {
+        $parentClasses = $this->owner->stat('parentClass');
+
+        if(!is_array($parentClasses)) {
+            return array($parentClasses);
+        }
+
+        return $parentClasses;
+
+    }
+
     /**
      * Gets the fieldname for the sort column. As we're on a subclass of SiteTree we assume 'Sort' as default.
      * Can be overwritten using $sort_column param on extended class.
@@ -97,7 +113,7 @@ public function getSortFieldname()
      */
     public function getCatalogParents()
     {
-        $parentClass = $this->owner->stat('parentClass');
+        $parentClass = $this->getParentClasses();
         if (count($parentClass)) {
             $pages = SiteTree::get()->filter(array('ClassName' => array_values($parentClass)));
             return $pages;