Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
Aios committed Sep 13, 2018
2 parents ebcd4a9 + 11a92a9 commit a17d37a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ SleepingOwl Admin is an administrative interface builder for Laravel.

1. Require this package in your composer.json and run composer update:

`composer require laravelrus/sleepingowl:5.6`
`composer require laravelrus/sleepingowl:5.6.*`


2. Run this command in the terminal (if you want to know more about what exactly this command does, see [install command documentation](https://en.sleepingowladmin.ru/docs/installation)):
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"kodicomponents/support": "0.*",
"kodicomponents/navigation": "0.*",
"doctrine/dbal": "~2.3",
"laravelcollective/html": "5.5.*",
"laravelcollective/html": "5.5.* || 5.6.* || 5.7.*",
"kodicms/laravel-assets": "0.*",
"erusev/parsedown": "1.*",
"davejamesmiller/laravel-breadcrumbs": "^3.0",
Expand Down
1 change: 1 addition & 0 deletions resources/views/default/_partials/header.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
<span class="sr-only">Toggle navigation</span>
</a>
@stack('navbar.left')
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
@stack('navbar')
Expand Down
6 changes: 5 additions & 1 deletion src/Traits/SelectOptionsFromModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,12 @@ public function getModelForOptions()
* @return $this
* @throws SelectException
*/
public function setModelForOptions($modelForOptions)
public function setModelForOptions($modelForOptions, $display = null)
{
if ($display) {
$this->display = $display;
}

if (is_string($modelForOptions)) {
$modelForOptions = app($modelForOptions);
}
Expand Down

0 comments on commit a17d37a

Please sign in to comment.