DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-13 15:01:02 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
snipe 2021-12-10 15:17:45 -08:00
parent e20a10a6a1 949141a8e7
commit 5381aa3fbd
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/AssetModelsController.php
View file

@ -269,6 +269,7 @@ class AssetModelsController extends Controller
*/ */
public function getClone($modelId = null) public function getClone($modelId = null)
{ {
$this->authorize('create', AssetModel::class);
// Check if the model exists // Check if the model exists
if (is_null($model_to_clone = AssetModel::find($modelId))) { if (is_null($model_to_clone = AssetModel::find($modelId))) {
return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist')); return redirect()->route('models.index')->with('error', trans('admin/models/message.does_not_exist'));

2
resources/views/reports/accessories.blade.php
View file

@ -36,6 +36,7 @@
<tr> <tr>
<th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th> <th class="col-sm-1">{{ trans('admin/companies/table.title') }}</th>
<th class="col-sm-1">{{ trans('admin/accessories/table.title') }}</th> <th class="col-sm-1">{{ trans('admin/accessories/table.title') }}</th>
<th class="col-sm-1">{{ trans('general.model_no') }}</th>
<th class="col-sm-1">{{ trans('admin/accessories/general.total') }}</th> <th class="col-sm-1">{{ trans('admin/accessories/general.total') }}</th>
<th class="col-sm-1">{{ trans('admin/accessories/general.remaining') }}</th> <th class="col-sm-1">{{ trans('admin/accessories/general.remaining') }}</th>
</tr> </tr>
@ -45,6 +46,7 @@
<tr> <tr>
<td>{{ is_null($accessory->company) ? '' : $accessory->company->name }}</td> <td>{{ is_null($accessory->company) ? '' : $accessory->company->name }}</td>
<td>{{ $accessory->name }}</td> <td>{{ $accessory->name }}</td>
<td>{{ $accessory->model_number }}</td>
<td>{{ $accessory->qty }}</td> <td>{{ $accessory->qty }}</td>
<td>{{ $accessory->numRemaining() }}</td> <td>{{ $accessory->numRemaining() }}</td>
</tr> </tr>