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

FIX: fix onepage menu

Browse Source
This commit is contained in:
Michal Kváček
2019-01-06 21:52:18 +01:00
parent 0d76cc0a62
commit 6cd1c23455
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OnePage/Http/Controllers/Admin/SetHomepage.php
+1 -1
View File
@@ -23,7 +23,7 @@ class SetHomepage extends Controller
/** /**
* SetHomepage constructor. * SetHomepage constructor.
* *
* @param Content $content * @param IContent $content
*/ */
public function __construct(IContent $content) public function __construct(IContent $content)
{ {
OnePage/Widgets/OnePageMenu/Presenter.php
+21 -4
View File
@@ -1,9 +1,13 @@
<?php <?php
namespace Templates\Base\OnePage\Widgets\OnePageMenu; namespace Templates\Base\OnePage\Widgets\OnePageMenu;
use App\CMS\Contracts\Repositories\Content as IContent;
use App\CMS\Contracts\Widgets\WidgetRenderer;
use App\CMS\Helpers\Settings;
use App\Models\Content\Content;
use App\Models\Widgets\Widget; use App\Models\Widgets\Widget;
use App\Models\Widgets\WidgetType; use App\Models\Widgets\WidgetType;
use App\CMS\Contracts\Widgets\WidgetRenderer;
use Templates\Base\OnePage\Handlers\OnePage; use Templates\Base\OnePage\Handlers\OnePage;
class Presenter implements WidgetRenderer class Presenter implements WidgetRenderer
@@ -15,7 +19,6 @@ class Presenter implements WidgetRenderer
/** /**
* Method used for displaying widget. * Method used for displaying widget.
*
* This method renders some HTML code for displaying. * This method renders some HTML code for displaying.
* *
* @param Widget $widget * @param Widget $widget
@@ -27,10 +30,24 @@ class Presenter implements WidgetRenderer
{ {
if (!self::$template) { if (!self::$template) {
self::$template = "menu"; self::$template = "menu";
// throw new \ErrorException('Cannot render menu without template! Please, set Presenter::$template variable before rendering.'); // throw new \ErrorException('Cannot render menu without template! Please, set Presenter::$template variable before rendering.');
} }
$pages = OnePage::getPagesOnHomepage(); $usedPagesIds = (array)Settings::getJson(OnePage::HOMEPAGE_PAGES_SETTINGS_KEY);
$contentPages = Content::whereIn('id', $usedPagesIds)
->get()
->keyBy('id');
// need to maintain order of pages
$homepage = app(IContent::class)->getHomepage();
$pages = collect();
$pages->push($homepage);
foreach ($usedPagesIds as $pageId) {
if (isset($contentPages[$pageId])) {
$pages->push($contentPages[$pageId]);
}
}
return view(self::$template, ['pages' => $pages, 'widget' => $widget])->render(); return view(self::$template, ['pages' => $pages, 'widget' => $widget])->render();
} }