lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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
parent b956a771f1 0ae510fdf0
commit baa78b9762
3 changed files with 4 additions and 4 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) public function compose(View $view)
{ {
$componentGroups = $this->getVisibleGroupedComponents(); $componentGroups = $this->getVisibleGroupedComponents();
$ungroupedComponents = Component::ungrouped()->get(); $ungroupedComponents = Component::ungrouped()->orderBy('status', 'desc')->get();
$view->withComponentGroups($componentGroups) $view->withComponentGroups($componentGroups)
->withUngroupedComponents($ungroupedComponents); ->withUngroupedComponents($ungroupedComponents);

2
app/Presenters/IncidentPresenter.php
View File

@@ -256,7 +256,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable
public function latest() public function latest()
{ {
if (is_bool($this->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; return $this->latest;

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

@@ -12,7 +12,7 @@
</li> </li>
<div class="group-items {{ $componentGroup->is_collapsed ? "hide" : null }}"> <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> </div>
@endif @endif
</ul> </ul>
@@ -25,7 +25,7 @@
<strong>{{ trans('cachet.components.group.other') }}</strong> <strong>{{ trans('cachet.components.group.other') }}</strong>
<div class="pull-right"> <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> </div>
</li> </li>