Skip to content

Commit 05876bb

Browse files
committed
Merge remote-tracking branch 'origin/develop'
2 parents 8bcd5a6 + 4bf5697 commit 05876bb

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

resources/views/layouts/default.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@
588588
</li>
589589
<li {!! (request()->is('maintenances') ? ' class="active"' : '') !!}>
590590
<a href="{{ route('maintenances.index') }}">
591-
{{ trans('general.asset_maintenances') }}
591+
{{ trans('general.maintenances') }}
592592
</a>
593593
</li>
594594
@endcan
@@ -820,8 +820,8 @@
820820
{{ trans('general.license_report') }}
821821
</a>
822822
</li>
823-
<li {{!! (request()->is('reports/maintenances') ? ' class="active"' : '') !!}}>
824-
<a href="{{ url('reports/asset_maintenances') }}">
823+
<li {{!! (request()->is('ui.reports.maintenances') ? ' class="active"' : '') !!}}>
824+
<a href="{{ url('ui.reports.maintenances') }}">
825825
{{ trans('general.asset_maintenance_report') }}
826826
</a>
827827
</li>

routes/web.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,10 @@
475475

476476
Route::get(
477477
'maintenances', [ReportsController::class, 'getMaintenancesReport'])
478-
->name('reports/maintenances')
478+
->name('ui.reports.maintenances')
479479
->breadcrumbs(fn (Trail $trail) =>
480480
$trail->parent('home')
481-
->push(trans('general.asset_maintenance_report'), route('reports/maintenances')));
481+
->push(trans('general.asset_maintenance_report'), route('ui.reports.maintenances')));
482482

483483
// Is this still used?
484484
Route::get('export/maintenances', [ReportsController::class, 'exportMaintenancesReport'])

0 commit comments

Comments
 (0)