DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-24 04:03:34 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-08-12 18:01:21 +01:00
parent 4dc57f95e2 c9f8a84d48
commit 4d8569e754
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Api/StatuslabelsController.php
View file

@ -8,6 +8,7 @@ use App\Http\Transformers\AssetsTransformer;
use App\Http\Transformers\SelectlistTransformer; use App\Http\Transformers\SelectlistTransformer;
use App\Http\Transformers\StatuslabelsTransformer; use App\Http\Transformers\StatuslabelsTransformer;
use App\Models\Asset; use App\Models\Asset;
use App\Models\Setting;
use App\Models\Statuslabel; use App\Models\Statuslabel;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Transformers\PieChartTransformer; use App\Http\Transformers\PieChartTransformer;
@ -187,8 +188,14 @@ class StatuslabelsController extends Controller
public function getAssetCountByStatuslabel() : array public function getAssetCountByStatuslabel() : array
{ {
$this->authorize('view', Statuslabel::class); $this->authorize('view', Statuslabel::class);
if (Setting::getSettings()->show_archived_in_list == 0 ) {
$statuslabels = Statuslabel::withCount('assets')->where('archived','0')->get();
} else {
$statuslabels = Statuslabel::withCount('assets')->get(); $statuslabels = Statuslabel::withCount('assets')->get();
$total = Array(); }
$total = [];
foreach ($statuslabels as $statuslabel) { foreach ($statuslabels as $statuslabel) {