DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-31 16:37:27 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-10-06 18:15:31 -07:00
parent ae4ba6176d df4cb7d351
commit 130a99c46f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -155,7 +155,7 @@ class StatuslabelsController extends Controller
public function getAssetCountByStatuslabel() public function getAssetCountByStatuslabel()
{ {
$statusLabels = Statuslabel::with('assets')->get(); $statusLabels = Statuslabel::get();
$labels=[]; $labels=[];
$points=[]; $points=[];
$colors=[]; $colors=[];

2
resources/views/dashboard.blade.php
View file

@ -328,7 +328,7 @@
}); });
}, },
error: function (data) { error: function (data) {
window.location.reload(true); // window.location.reload(true);
} }
}); });