Skip to content

Commit 6cd5ba6

Browse files
committed
Fix navigation errors
1 parent d7cd3ca commit 6cd5ba6

File tree

22 files changed

+218
-148
lines changed

22 files changed

+218
-148
lines changed

public/cms/css/common.css

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/cms/css/page-wysiwyg.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/cms/js/backend.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/cms/js/libraries.js

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/cms/js/page-wysiwyg-libraries.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/cms/js/page-wysiwyg.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/cms/libs/elfinder/js/elfinder.min.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/cms/libs/query-builder/query-builder.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/assets/js/cms/core.js

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Http/Controllers/System/BackendController.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
namespace KodiCMS\CMS\Http\Controllers\System;
44

55
use UI;
6-
use View;
76
use Meta;
87
use KodiCMS\Navigation\Navigation;
98
use KodiCMS\Support\Helpers\Callback;
10-
use KodiCMS\Support\Helpers\NavigationBreadcrumbs;
119
use KodiCMS\CMS\Breadcrumbs\Collection as Breadcrumbs;
1210
use Illuminate\Database\Eloquent\ModelNotFoundException;
1311

@@ -33,12 +31,19 @@ public function before()
3331
{
3432
$this->breadcrumbs->add(UI::icon('home'), route('backend.dashboard'));
3533

34+
if ($currentPage = $this->navigation->getCurrentPage()) {
35+
foreach ($currentPage->getPathArray() as $page) {
36+
$this->breadcrumbs->add($page['title'], $page['url']);
37+
}
38+
}
39+
3640
parent::before();
3741
}
3842

3943
public function after()
4044
{
41-
$this->template->with('breadcrumbs', $this->breadcrumbs)
45+
$this->template
46+
->with('breadcrumbs', $this->breadcrumbs)
4247
->with('navigation', $this->navigation)
4348
->with('bodyId', $this->getRouterPath());
4449

0 commit comments

Comments
 (0)