Merge pull request #3432 from CachetHQ/hotfix/duplicate-order-statement

Remove duplicate order statement
This commit is contained in:
James Brooks
2019-01-27 22:22:00 +00:00
committed by GitHub
3 changed files with 4 additions and 4 deletions

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>