DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 16:27:35 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-11-04 01:11:41 -07:00
parent c7c63e8432 2de0a3669e
commit 14ca690441
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Transformers/SelectlistTransformer.php
View file

@ -34,7 +34,10 @@ class SelectlistTransformer
// This is weird and awful, but the only way I can find to allow the user to // This is weird and awful, but the only way I can find to allow the user to
// clear the selection - @snipe // clear the selection - @snipe
array_unshift($items_array, ['id' =>'', 'text'=> trans('general.clear_selection')]); if (count($items_array) > 0) {
array_unshift($items_array, ['id' =>'', 'text'=> trans('general.clear_selection')]);
}
$results = [ $results = [
'items' => $items_array, 'items' => $items_array,
'pagination' => 'pagination' =>