mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 13:38:20 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Remove duplicate order statement
This commit is contained in:
James Brooks 2019-01-27 22:22:00 +00:00 committed by GitHub
commit baa78b9762
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats 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);

2
app/Presenters/IncidentPresenter.php
View File

@ -256,7 +256,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
public function latest()
{
if (is_bool($this->latest)) {
$this->latest = $this->wrappedObject->updates()->orderBy('created_at', 'desc')->first();
$this->latest = $this->wrappedObject->updates()->first();
}
return $this->latest;

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>