Skip to content

Commit

Permalink
Merge pull request #2853 from z-song/analysis-qyPMV2
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
z-song committed Dec 13, 2018
2 parents 4cd4e4a + 7b3fc61 commit 818e669
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/Controllers/PermissionController.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ protected function grid()
})->map(function ($name) {
return "<span class='label label-primary'>{$name}</span>";
})->implode('&nbsp;');

if (!empty(config('admin.route.prefix'))) {
$path = '/'.trim(config('admin.route.prefix'), '/').$path;
}
Expand Down Expand Up @@ -156,7 +156,7 @@ protected function detail($id)
})->map(function ($name) {
return "<span class='label label-primary'>{$name}</span>";
})->implode('&nbsp;');

if (!empty(config('admin.route.prefix'))) {
$path = '/'.trim(config('admin.route.prefix'), '/').$path;
}
Expand Down
3 changes: 1 addition & 2 deletions src/Grid/Filter/Layout/Layout.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ public function removeDefaultIDFilter()
$this->columns()
->first()
->filters()
->shift()
;
->shift();
}
}
2 changes: 1 addition & 1 deletion src/Widgets/Carousel.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function render()
'items' => $this->items,
'title' => $this->title,
'attributes' => $this->formatAttributes(),
'id' => $this->id
'id' => $this->id,
];

return view($this->view, $variables)->render();
Expand Down

0 comments on commit 818e669

Please sign in to comment.