DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2019-03-08 16:24:12 -08:00
parent 74f33441d3 55cbbf2b00
commit 400907cc40
4 changed files with 5 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/views/account/view-assets.blade.php
View file

@ -67,10 +67,10 @@ View Assets for {{ $user->present()->fullName() }}
<td>{{ $asset->serial }}</td> <td>{{ $asset->serial }}</td>
<td> <td>
@if (($asset->image) && ($asset->image!='')) @if (($asset->image) && ($asset->image!=''))
<img src="{{ url('/') }}/uploads/assets/{{ $asset->image }}" height="50" width="50"> <img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($asset->image)) }}" height="50" width="50">
@elseif (($asset->model) && ($asset->model->image!='')) @elseif (($asset->model) && ($asset->model->image!=''))
<img src="{{ url('/') }}/uploads/models/{{ $asset->model->image }}" height="50" width="50"> <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($asset->model->image)) }}" height="50" width="50">
@endif @endif
</td> </td>
</tr> </tr>

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

@ -317,44 +317,7 @@
success: function (data) { success: function (data) {
var myPieChart = new Chart(ctx,{ var myPieChart = new Chart(ctx,{
type : 'doughnut', type : 'doughnut',
data : { data : data,
"labels": [
"Ready to Deploy (1,273)",
"Pending (50)",
"Archived (50)"
],
"datasets": [
{
"data": [
1273,
50,
50,
],
"backgroundColor": [
"#f56954",
"#00a65a",
"#f39c12",
"#00c0ef",
"#3c8dbc",
"#d2d6de",
"#3c8dbc",
"#3c8dbc",
"#3c8dbc"
],
"hoverBackgroundColor": [
"#f56954",
"#00a65a",
"#f39c12",
"#00c0ef",
"#3c8dbc",
"#d2d6de",
"#3c8dbc",
"#3c8dbc",
"#3c8dbc"
]
}
]
},
options: pieOptions options: pieOptions
}); });
}, },

2
resources/views/models/view.blade.php
View file

@ -96,7 +96,7 @@
<div class="box-body"> <div class="box-body">
@if ($model->image) @if ($model->image)
<img src="{{ url('/') }}/uploads/models/{{ $model->image }}" class="img-responsive"></li> <img src="{{ Storage::disk('public')->url(app('models_upload_path').e($model->image)) }}" class="img-responsive"></li>
@endif @endif

2
resources/views/suppliers/view.blade.php
View file

@ -278,7 +278,7 @@
</ul> </ul>
@if ($supplier->image!='') @if ($supplier->image!='')
<div class="col-md-12 text-center" style="padding-bottom: 20px;"> <div class="col-md-12 text-center" style="padding-bottom: 20px;">
<img src="{{ app('suppliers_upload_url') }}/{{ $supplier->image }}" class="img-responsive img-thumbnail" alt="{{ $supplier->name }}"> <img src="{{ Storage::disk('public')->url(app('suppliers_upload_url').e($supplier->image)) }}" class="img-responsive img-thumbnail" alt="{{ $supplier->name }}">
</div> </div>
@endif @endif