DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-12 22:37:28 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #9950 from inietov/fixes/ch945/status_colors_are_not_displaying_correctly

Browse source 
Looks great, thanks!
This commit is contained in:
snipe 2021-08-18 14:09:26 -07:00 committed by GitHub
parent 923d2a79ae f04e23cacb
commit 6f7718dd0e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Helpers/Helper.php
View file

@ -67,7 +67,7 @@ class Helper
{
$colors = [
"#008941",
"#FF4A46",
"#FF851B",
"#006FA6",
"#A30059",
"#1CE6FF",

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

@ -176,7 +176,6 @@ class StatuslabelsController extends Controller
foreach ($statuslabels as $statuslabel) {
if ($statuslabel->assets_count > 0) {
$labels[]=$statuslabel->name. ' ('.number_format($statuslabel->assets_count).')';
$points[]=$statuslabel->assets_count;
@ -184,8 +183,8 @@ class StatuslabelsController extends Controller
$colors_array[] = $statuslabel->color;
} else {
$colors_array[] = Helper::defaultChartColors($default_color_count);
$default_color_count++;
}
$default_color_count++;
}
}