Include children and drafts in allowed pages

sylvainjule · Feb 23, 2022 · 9c2a624 · 9c2a624
1 parent 1a6e407
commit 9c2a624
Showing 1 changed file with 21 additions and 23 deletions.
diff --git a/lib/bouncer.php b/lib/bouncer.php
@@ -2,27 +2,6 @@
 
 class Bouncer {
 
-    private static function getChildren($allowed, Kirby\Cms\Page $page) {
-        if (!$page->hasChildren()) {
-            return [];
-        }
-
-        $allowed = [];
-        $pages = $page->childrenAndDrafts();
-        foreach($pages as $p) {
-            $allowed[] = [
-                'title' => $p->title()->value(),
-                'path'  => $p->panelUrl(true)
-            ];
-
-
-            $children = Bouncer::getChildren($allowed, $p);
-            $allowed = array_merge($allowed, $children);
-        }
-
-        return $allowed;
-    }
-
     public static function getAllowedPages($user, $fieldname, $extra = false) {
         $kirby   = kirby();
         $allowed = [];
@@ -37,8 +16,8 @@ public static function getAllowedPages($user, $fieldname, $extra = false) {
                     'path'  => $page->panelUrl(true)
                 ];
 
-                $children = $extra ? Bouncer::getChildren($allowed, $page) : [];
-                $allowed = array_merge($allowed, $children);
+                $children = $extra ? static::getChildren($page) : [];
+                $allowed  = array_merge($allowed, $children);
             }
         }
 
@@ -56,4 +35,23 @@ public static function getAllowedPages($user, $fieldname, $extra = false) {
         return $allowed;
     }
 
+    private static function getChildren(Kirby\Cms\Page $page) {
+        if (!($page->hasChildren() || $page->hasDrafts())) { return []; }
+
+        $allowed = [];
+        $pages   = $page->childrenAndDrafts();
+
+        foreach($pages as $p) {
+            $allowed[] = [
+                'title' => $p->title()->value(),
+                'path'  => $p->panelUrl(true)
+            ];
+
+            $children = static::getChildren($p);
+            $allowed  = array_merge($allowed, $children);
+        }
+
+        return $allowed;
+    }
+
 }