FIX: fix paginated results in root pages in content editor

app/CMS/Repositories/Content/Content.php

@@ -46,7 +46,7 @@ class Content extends Repository implements IContent
     public function all()
     {
         return $this->getPageQuery()
-                      ->get();
+                    ->get();
     }
 
     /**
@@ -63,7 +63,7 @@ class Content extends Repository implements IContent
             $page->status = IContent::STATUS_DRAFT;
             $page->moduleSettings = [];
         } else {
-                $page = $this->model->findOrFail($id);
+            $page = $this->model->findOrFail($id);
         }
 
         return $page;
@@ -76,9 +76,8 @@ class Content extends Repository implements IContent
     public function getHomepage()
     {
         return $this->getPageQuery()
-                     ->where('isHomepage', 1)
-                     ->first();
-
+                    ->where('isHomepage', 1)
+                    ->first();
     }
 
     /**
@@ -91,8 +90,8 @@ class Content extends Repository implements IContent
     public function getByURL($url)
     {
         return $this->getPageQuery()
-                     ->where('url', $url)
-                     ->first();
+                    ->where('url', $url)
+                    ->first();
     }
 
     /**
@@ -126,8 +125,6 @@ class Content extends Repository implements IContent
             $query = $query->whereIn('contents.status', $statuses);
         }
 
-        $pages = $query->paginate(setting('paginatedResults', 20));
-
-        return $pages;
+        return $query;
     }
 }

app/CMS/Widgets/Menu/Presenters/Menu.php

@@ -107,7 +107,8 @@ class Menu implements WidgetRenderer
         $content = App::make(ContentContract::class);
 
         // get list of all pages
-        $pages = $content->getOverview();
+        $pages = $content->getOverview()
+                         ->get();
 
         // make object from JSON
         if (!isset($widget->settings->links)) {

app/Http/Controllers/Admin/Contents/ContentOverview.php

@@ -39,7 +39,8 @@ class ContentOverview extends Controller
 
         // get pages for overview
         $handler = $module !== null ? $module->handler : null;
-        $pages = $this->content->getOverview($handler, [$status]);
+        $pages = $this->content->getOverview($handler, [$status])
+                               ->paginate(setting('paginatedResults', 20));
 
         // get homepage - for checking if homepage is set and available
         $homepage = $this->content->getHomepage();

app/Http/Controllers/Admin/Contents/CreateNewContent.php

@@ -4,13 +4,13 @@ namespace App\Http\Controllers\Admin\Contents;
 use App\CMS\Contracts\Repositories\Content as IContent;
 use App\CMS\Contracts\Repositories\Module as IModuleRepository;
 use App\CMS\Contracts\Repositories\Template as ITemplate;
-use Modules\Categories\Contracts\Repositories\Category as ICategory;
 use App\CMS\Enumerations\ContentStatuses;
 use App\Cms\Handlers\Interactions\Interaction;
 use App\Cms\Interactions\Admin\Content\NewContent;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\CreateNewContentRequest;
 use App\Http\Requests\Request;
+use Modules\Categories\Contracts\Repositories\Category as ICategory;
 
 /**
  * Class CreateNewContent
@@ -85,7 +85,8 @@ class CreateNewContent extends Controller
             'module'           => $module,
             'categories'       => $categories,
             'page'             => $page,
-            'rootPages'        => $this->content->getOverview(),
+            'rootPages'        => $this->content->getOverview()
+                                                ->get(),
             'formSectionNames' => call_user_func([$module->handler, 'getExtendedFormSections']),
             'formSections'     => call_user_func([$module->handler, 'getExtendedFormInputsCreate']),
         ]);

app/Http/Controllers/Admin/Contents/EditContent.php

@@ -94,7 +94,7 @@ class EditContent extends Controller
             'page'             => $page,
             'module'           => $module,
             'categories'       => $categories,
-            'rootPages'        => $this->content->getOverview(),
+            'rootPages'        => $this->content->getOverview()->get(),
             'templates'        => $templates,
             'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'),
             'formSections'     => $this->module->call($module, 'getExtendedFormInputsEdit'),

templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php

@@ -1,9 +1,9 @@
 <?php
 namespace Templates\Base\OnePage\Http\Controllers\Admin;
 
+use App\CMS\Contracts\Repositories\Content as IContent;
 use App\CMS\Helpers\Settings;
 use App\Http\Controllers\Admin\Controller;
-use App\CMS\Contracts\Repositories\Content as IContent;
 use App\Models\Settings as SettingsModel;
 use Illuminate\Support\Facades\Event;
 use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
@@ -41,7 +41,8 @@ class SetHomepage extends Controller
         $usedPagesIds = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY);
 
         // get all pages - they will be separated for used and not used on next lines
-        $allPages = $this->content->getOverview();
+        $allPages = $this->content->getOverview()
+                                  ->get();
 
         // separate pages to used and not used - with help of $usedPAgesIds array defined above
         $pages = $used = $notUsed = [];