minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: fix paginated results in root pages in content editor

Browse Source
This commit is contained in:
Michal Kváček
2017-03-23 00:01:47 +01:00
parent 52f39fda0c
commit 42066d4ae9
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/CMS/Repositories/Content/Content.php
+1 -4
View File
@@ -78,7 +78,6 @@ class Content extends Repository implements IContent
return $this->getPageQuery() return $this->getPageQuery()
->where('isHomepage', 1) ->where('isHomepage', 1)
->first(); ->first();
} }
/** /**
@@ -126,8 +125,6 @@ class Content extends Repository implements IContent
$query = $query->whereIn('contents.status', $statuses); $query = $query->whereIn('contents.status', $statuses);
} }
$pages = $query->paginate(setting('paginatedResults', 20)); return $query;
return $pages;
} }
} }
app/CMS/Widgets/Menu/Presenters/Menu.php
+2 -1
View File
@@ -107,7 +107,8 @@ class Menu implements WidgetRenderer
$content = App::make(ContentContract::class); $content = App::make(ContentContract::class);
// get list of all pages // get list of all pages
$pages = $content->getOverview(); $pages = $content->getOverview()
->get();
// make object from JSON // make object from JSON
if (!isset($widget->settings->links)) { if (!isset($widget->settings->links)) {
app/Http/Controllers/Admin/Contents/ContentOverview.php
+2 -1
View File
@@ -39,7 +39,8 @@ class ContentOverview extends Controller
// get pages for overview // get pages for overview
$handler = $module !== null ? $module->handler : null; $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 // get homepage - for checking if homepage is set and available
$homepage = $this->content->getHomepage(); $homepage = $this->content->getHomepage();
app/Http/Controllers/Admin/Contents/CreateNewContent.php
+3 -2
View File
@@ -4,13 +4,13 @@ namespace App\Http\Controllers\Admin\Contents;
use App\CMS\Contracts\Repositories\Content as IContent; use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Repositories\Module as IModuleRepository; use App\CMS\Contracts\Repositories\Module as IModuleRepository;
use App\CMS\Contracts\Repositories\Template as ITemplate; use App\CMS\Contracts\Repositories\Template as ITemplate;
use Modules\Categories\Contracts\Repositories\Category as ICategory;
use App\CMS\Enumerations\ContentStatuses; use App\CMS\Enumerations\ContentStatuses;
use App\Cms\Handlers\Interactions\Interaction; use App\Cms\Handlers\Interactions\Interaction;
use App\Cms\Interactions\Admin\Content\NewContent; use App\Cms\Interactions\Admin\Content\NewContent;
use App\Http\Controllers\Admin\Controller; use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\CreateNewContentRequest; use App\Http\Requests\CreateNewContentRequest;
use App\Http\Requests\Request; use App\Http\Requests\Request;
use Modules\Categories\Contracts\Repositories\Category as ICategory;
/** /**
* Class CreateNewContent * Class CreateNewContent
@@ -85,7 +85,8 @@ class CreateNewContent extends Controller
'module' => $module, 'module' => $module,
'categories' => $categories, 'categories' => $categories,
'page' => $page, 'page' => $page,
'rootPages' => $this->content->getOverview(), 'rootPages' => $this->content->getOverview()
->get(),
'formSectionNames' => call_user_func([$module->handler, 'getExtendedFormSections']), 'formSectionNames' => call_user_func([$module->handler, 'getExtendedFormSections']),
'formSections' => call_user_func([$module->handler, 'getExtendedFormInputsCreate']), 'formSections' => call_user_func([$module->handler, 'getExtendedFormInputsCreate']),
]); ]);
app/Http/Controllers/Admin/Contents/EditContent.php
+1 -1
View File
@@ -94,7 +94,7 @@ class EditContent extends Controller
'page' => $page, 'page' => $page,
'module' => $module, 'module' => $module,
'categories' => $categories, 'categories' => $categories,
'rootPages' => $this->content->getOverview(), 'rootPages' => $this->content->getOverview()->get(),
'templates' => $templates, 'templates' => $templates,
'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'), 'formSectionNames' => $this->module->call($module, 'getExtendedFormSections'),
'formSections' => $this->module->call($module, 'getExtendedFormInputsEdit'), 'formSections' => $this->module->call($module, 'getExtendedFormInputsEdit'),
templates/Base/OnePage/Http/Controllers/Admin/SetHomepage.php
+3 -2
View File
@@ -1,9 +1,9 @@
<?php <?php
namespace Templates\Base\OnePage\Http\Controllers\Admin; namespace Templates\Base\OnePage\Http\Controllers\Admin;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Helpers\Settings; use App\CMS\Helpers\Settings;
use App\Http\Controllers\Admin\Controller; use App\Http\Controllers\Admin\Controller;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\Models\Settings as SettingsModel; use App\Models\Settings as SettingsModel;
use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Event;
use Mcamara\LaravelLocalization\Facades\LaravelLocalization; use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
@@ -41,7 +41,8 @@ class SetHomepage extends Controller
$usedPagesIds = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY); $usedPagesIds = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY);
// get all pages - they will be separated for used and not used on next lines // 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 // separate pages to used and not used - with help of $usedPAgesIds array defined above
$pages = $used = $notUsed = []; $pages = $used = $notUsed = [];