Skip to content

Commit 9965335

Browse files
authored
Merge pull request #7 from smtlk/fixes
Fixes to Controller & Composer Version Dependencies
2 parents 4538ec7 + 985d670 commit 9965335

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"require": {
1515
"php": ">=7.0.0",
1616
"laravel/framework": "~5.5",
17-
"encore/laravel-admin": "1.5.*"
17+
"encore/laravel-admin": "~1.5"
1818
},
1919
"require-dev": {
2020
"phpunit/phpunit": "~6.0",

src/LogController.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@
99

1010
class LogController extends Controller
1111
{
12-
public function index($file, Request $request)
12+
public function index($file = null, Request $request)
1313
{
14+
if ($file === null) {
15+
$file = (new LogViewer())->getLastModifiedLog();
16+
}
17+
1418
return Admin::content(function (Content $content) use ($file, $request) {
1519
$offset = $request->get('offset');
1620

0 commit comments

Comments
 (0)