lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix other duplicate order by statements

Browse Source
This commit is contained in:
James Brooks
2019-01-26 15:00:42 +00:00
parent e21918c81e
commit 0ae510fdf0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Composers/ComponentsComposer.php
View File

@@ -53,7 +53,7 @@ class ComponentsComposer
public function compose(View $view)
{
$componentGroups = $this->getVisibleGroupedComponents();
$ungroupedComponents = Component::ungrouped()->get();
$ungroupedComponents = Component::ungrouped()->orderBy('status', 'desc')->get();
$view->withComponentGroups($componentGroups)
->withUngroupedComponents($ungroupedComponents);

4
resources/views/partials/components.blade.php
View File

@@ -12,7 +12,7 @@
</li>
<div class="group-items {{ $componentGroup->is_collapsed ? "hide" : null }}">
@each('partials.component', $componentGroup->enabled_components()->orderBy('order')->get(), 'component')
@each('partials.component', $componentGroup->enabled_components, 'component')
</div>
@endif
</ul>
@@ -25,7 +25,7 @@
<strong>{{ trans('cachet.components.group.other') }}</strong>
<div class="pull-right">
<i class="ion ion-ios-circle-filled text-component-{{ $ungroupedComponents->max('status') }} {{ $ungroupedComponents->sortByDesc('status')->first()->status_color }}" data-toggle="tooltip" title="{{ $ungroupedComponents->sortByDesc('status')->first()->human_status }}"></i>
<i class="ion ion-ios-circle-filled text-component-{{ $ungroupedComponents->max('status') }} {{ $ungroupedComponents->first()->status_color }}" data-toggle="tooltip" title="{{ $ungroupedComponents->first()->human_status }}"></i>
</div>
</li>