Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 83a8e72

Browse files
committed
fixes
- fix unfound route under current locale error - fix hide child bc when parent is under diff locale - append locale name to the menu item if under diff locale - show route name in pages index
1 parent baf5353 commit 83a8e72

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

src/Traits/NavigationTrait.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public function getUrl($code)
2222
$name = Route::currentRouteName();
2323

2424
// redir to '/' if current route ancestor is not found under current locale
25-
if ($bc = $this->getRouteData($name)['breadCrumb']) {
25+
$bc = $this->getRouteData($name)['breadCrumb'];
26+
27+
if (isset($bs) && count($bc)) {
2628
if (!$this->searchForRoute($bc->pluck('route_name')->first(), $code)) {
2729
return LaravelLocalization::getLocalizedURL($code, url('/'), [], true);
2830
}
@@ -59,6 +61,10 @@ public function getUrl($code)
5961
*/
6062
public function getRoute($crntRouteName, array $params = null)
6163
{
64+
if (!Route::has($crntRouteName)) {
65+
return;
66+
}
67+
6268
$locale = $this->getCrntLocale();
6369
$url = $this->routeLink($crntRouteName, $locale);
6470

src/resources/assets/js/components/menu-comp.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export default {
5151
getTitle(title) {
5252
let locale = this.locale
5353
let v = Object.keys(title).indexOf(locale)
54-
return title.hasOwnProperty(locale) ? Object.values(title)[v] : Object.values(title)[0]
54+
return title.hasOwnProperty(locale) ? Object.values(title)[v] : Object.values(title)[0].concat(` "${Object.keys(title)[0]}"`)
5555
},
5656
5757
// operations

src/resources/assets/js/components/menu-comp_childs.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<!-- main -->
88
<div class="notification is-dark menu-item" :class="classObj(item)">
99
<span class="icon is-small"><i class="fa fa-caret-right"></i></span>
10-
<span v-html="getTitle(item.title)"></span>
10+
<span>{{ getTitle(item.title) }}</span>
1111

1212
<!-- ops -->
1313
<button type="button" v-if="checkFrom(item)" class="delete" @click="undoItem(item)" title="undo"></button>
@@ -65,7 +65,7 @@ export default {
6565
getTitle(title) {
6666
let locale = this.locale
6767
let v = Object.keys(title).indexOf(locale)
68-
return title.hasOwnProperty(locale) ? Object.values(title)[v] : Object.values(title)[0]
68+
return title.hasOwnProperty(locale) ? Object.values(title)[v] : Object.values(title)[0].concat(` "${Object.keys(title)[0]}"`)
6969
},
7070
7171
// operations

src/resources/lang/en/messages.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'title' => 'Pages',
1919
'fields' => [
2020
'title' => 'Title',
21+
'route' => 'Route Name',
2122
'roles' => 'Roles',
2223
'permissions' => 'Permissions',
2324
'menus' => 'Menus',

src/resources/views/admin/bulma/menus/edit.blade.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class="column is-4 menu-list"
4444
{{-- main --}}
4545
<div class="notification is-info menu-item" :class="classObj(item)">
4646
<span class="icon is-small"><i class="fa fa-caret-right"></i></span>
47-
<span v-html="getTitle(item.title)"></span>
47+
<span>@{{ getTitle(item.title) }}</span>
4848

4949
{{-- ops --}}
5050
<button type="button" v-if="checkFrom(item)" class="delete" @click="undoItem(item)" title="undo"></button>
@@ -70,7 +70,7 @@ class="column"
7070
:options="{draggable:'.item', group:{name:'pages', put:false}, chosenClass:'is-warning', sort: false}">
7171
<li v-for="item in allPages" :key="item.id" class="item notification is-info menu-item">
7272
<span class="icon is-small"><i class="fa fa-caret-right"></i></span>
73-
<span v-html="getTitle(item.title)"></span>
73+
<span>@{{ getTitle(item.title) }}</span>
7474
</li>
7575
</draggable>
7676
</div>

src/resources/views/admin/bulma/pages/index.blade.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<thead>
1515
<tr>
1616
<th>@lang('SimpleMenu::messages.pages.fields.title')</th>
17+
<th>@lang('SimpleMenu::messages.pages.fields.route')</th>
1718
<th>@lang('SimpleMenu::messages.pages.fields.roles')</th>
1819
<th>@lang('SimpleMenu::messages.pages.fields.permissions')</th>
1920
<th>@lang('SimpleMenu::messages.pages.fields.menus')</th>
@@ -26,6 +27,7 @@
2627
<tbody>
2728
@foreach ($pages as $page)
2829
@include('SimpleMenu::menu.partials.r_params')
30+
2931
<tr id="item-{{ $page->id }}">
3032
<td>
3133
@if (in_array(LaravelLocalization::getCurrentLocale(), $page->getTranslatedLocales('title')))
@@ -34,6 +36,9 @@
3436
{{ empty($page->title) ? collect($page->getTranslations('title'))->first() : $page->title }}
3537
@endif
3638
</td>
39+
<td>
40+
{{ $page->route_name }}
41+
</td>
3742
<td>
3843
@foreach ($page->roles as $role)
3944
<span class="tag is-medium is-info">

0 commit comments

Comments
 (0)