Skip to content

Commit a17d37a

Browse files
author
Aios
committed
Merge branch 'development'
2 parents ebcd4a9 + 11a92a9 commit a17d37a

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SleepingOwl Admin is an administrative interface builder for Laravel.
3232

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

35-
`composer require laravelrus/sleepingowl:5.6`
35+
`composer require laravelrus/sleepingowl:5.6.*`
3636

3737

3838
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)):

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"kodicomponents/support": "0.*",
4040
"kodicomponents/navigation": "0.*",
4141
"doctrine/dbal": "~2.3",
42-
"laravelcollective/html": "5.5.*",
42+
"laravelcollective/html": "5.5.* || 5.6.* || 5.7.*",
4343
"kodicms/laravel-assets": "0.*",
4444
"erusev/parsedown": "1.*",
4545
"davejamesmiller/laravel-breadcrumbs": "^3.0",

resources/views/default/_partials/header.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<a href="#" class="sidebar-toggle" data-toggle="push-menu" role="button">
99
<span class="sr-only">Toggle navigation</span>
1010
</a>
11+
@stack('navbar.left')
1112
<div class="navbar-custom-menu">
1213
<ul class="nav navbar-nav">
1314
@stack('navbar')

src/Traits/SelectOptionsFromModel.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,12 @@ public function getModelForOptions()
5858
* @return $this
5959
* @throws SelectException
6060
*/
61-
public function setModelForOptions($modelForOptions)
61+
public function setModelForOptions($modelForOptions, $display = null)
6262
{
63+
if ($display) {
64+
$this->display = $display;
65+
}
66+
6367
if (is_string($modelForOptions)) {
6468
$modelForOptions = app($modelForOptions);
6569
}

0 commit comments

Comments
 (0)