Skip to content

Commit

Permalink
Merge pull request #7 from smtlk/fixes
Browse files Browse the repository at this point in the history
Fixes to Controller & Composer Version Dependencies
  • Loading branch information
z-song authored Apr 24, 2018
2 parents 4538ec7 + 985d670 commit 9965335
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"require": {
"php": ">=7.0.0",
"laravel/framework": "~5.5",
"encore/laravel-admin": "1.5.*"
"encore/laravel-admin": "~1.5"
},
"require-dev": {
"phpunit/phpunit": "~6.0",
Expand Down
6 changes: 5 additions & 1 deletion src/LogController.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,12 @@

class LogController extends Controller
{
public function index($file, Request $request)
public function index($file = null, Request $request)
{
if ($file === null) {
$file = (new LogViewer())->getLastModifiedLog();
}

return Admin::content(function (Content $content) use ($file, $request) {
$offset = $request->get('offset');

Expand Down

0 comments on commit 9965335

Please sign in to comment.