mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-15 18:14:09 -08:00
a05c33febf
commit147fcfb8eb
Merge:58a3d09b5
fdcc17ca2
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 15:12:55 2024 +0100 Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs Fix user creation with FullMultipleCompanySupport enabled over API commit58a3d09b5f
Merge:30a06a594
867fa2f36
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 14:55:42 2024 +0100 Merge pull request #15703 from marcusmoore/bug/sc-27188 Linked accessory files in activity report commit30a06a5942
Merge:6c6af78e0
ce3086317
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 11:47:06 2024 +0100 Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing Removed brianium/paratest commit6c6af78e08
Merge:9b06bbb6c
3f79fd7ea
Author: snipe <snipe@snipe.net> Date: Tue Oct 22 11:46:04 2024 +0100 Merge pull request #15705 from marcusmoore/tests/icon-component-test Added test to ensure icon component does not end in newline commit3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 17:07:40 2024 -0700 Add test to ensure icon component does not end in newline commit9b06bbb6c3
Merge:46ad1d072
d7f70146f
Author: snipe <snipe@snipe.net> Date: Mon Oct 21 22:38:26 2024 +0100 Merge pull request #15704 from marcusmoore/bug/remove-extra-icon Removed second icon in accessory file list commitce30863177
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:57:04 2024 -0700 Remove brianium/paratest dependency commitd7f70146f4
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 13:48:25 2024 -0700 Remove extra icon in accessory file upload list commit867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Oct 21 12:40:24 2024 -0700 Display file in activity report for accessories commit0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Oct 17 18:01:48 2024 -0700 Remove --parallel flag commit46ad1d072f
Merge:bcb4bd9eb
3cf746d7d
Author: snipe <snipe@snipe.net> Date: Thu Oct 17 15:29:47 2024 +0100 Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions Bulk checkout to bulk actions commitbcb4bd9eb4
Merge:250037540
f50ccbcc4
Author: snipe <snipe@snipe.net> Date: Thu Oct 17 10:20:13 2024 +0100 Merge pull request #15683 from Toreg87/fixes/outdated_comment Fix outdated comment in CompanyableTrait commitf50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com> Date: Thu Oct 17 11:07:28 2024 +0200 Fix outdated comment in CompanyableTrait As of commit5800e8d
the user model uses CompanyableTrait so remove this clearly outdated comment commit3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Oct 16 23:13:32 2024 +0100 Rework the bulk checkout to not change how all checkouts work commit6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com> Date: Thu Oct 10 13:28:23 2024 +0100 Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar commitfdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com> Date: Wed Oct 16 11:18:24 2024 +0200 Fix user creation with FullMultipleCompanySupport enabled over API It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled. Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed. Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled. Signed-off-by: snipe <snipe@snipe.net>
315 lines
15 KiB
PHP
315 lines
15 KiB
PHP
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
|
|
{{ $accessory->name }}
|
|
{{ trans('general.accessory') }}
|
|
@if ($accessory->model_number!='')
|
|
({{ $accessory->model_number }})
|
|
@endif
|
|
|
|
@parent
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
{{-- Page content --}}
|
|
<div class="row">
|
|
<div class="col-md-9">
|
|
|
|
<!-- Custom Tabs -->
|
|
<div class="nav-tabs-custom">
|
|
<ul class="nav nav-tabs hidden-print">
|
|
|
|
<li class="active">
|
|
<a href="#checkedout" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<x-icon type="info-circle" class="fa-2x" />
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">{{ trans('admin/users/general.info') }}</span>
|
|
</a>
|
|
</li>
|
|
|
|
<li>
|
|
<a href="#history" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<x-icon type="history" class="fa-2x" />
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">{{ trans('general.history') }}</span>
|
|
</a>
|
|
</li>
|
|
|
|
|
|
@can('accessories.files', $accessory)
|
|
<li>
|
|
<a href="#files" data-toggle="tab">
|
|
<span class="hidden-lg hidden-md">
|
|
<x-icon type="files" class="fa-2x" />
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">{{ trans('general.file_uploads') }}
|
|
{!! ($accessory->uploads->count() > 0 ) ? '<badge class="badge badge-secondary">'.number_format($accessory->uploads->count()).'</badge>' : '' !!}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
|
|
@can('update', $accessory)
|
|
<li class="pull-right">
|
|
<a href="#" data-toggle="modal" data-target="#uploadFileModal">
|
|
<span class="hidden-lg hidden-xl hidden-md">
|
|
<x-icon type="paperclip" class="fa-2x" />
|
|
</span>
|
|
<span class="hidden-xs hidden-sm">
|
|
<x-icon type="paperclip" />
|
|
{{ trans('button.upload') }}
|
|
</span>
|
|
</a>
|
|
</li>
|
|
@endcan
|
|
</ul>
|
|
|
|
<div class="tab-content">
|
|
|
|
<div class="tab-pane active" id="checkedout">
|
|
<div class="table table-responsive">
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<table
|
|
data-cookie-id-table="checkoutsTable"
|
|
data-pagination="true"
|
|
data-id-table="checkoutsTable"
|
|
data-search="true"
|
|
data-side-pagination="server"
|
|
data-show-columns="true"
|
|
data-show-fullscreen="true"
|
|
data-show-export="true"
|
|
data-show-refresh="true"
|
|
data-sort-order="asc"
|
|
id="checkoutsTable"
|
|
class="table table-striped snipe-table"
|
|
data-url="{{ route('api.accessories.checkedout', $accessory->id) }}"
|
|
data-export-options='{
|
|
"fileName": "export-accessories-{{ str_slug($accessory->name) }}-checkouts-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'>
|
|
<thead>
|
|
<tr>
|
|
<th data-searchable="false" data-formatter="polymorphicItemFormatter" data-sortable="false" data-field="assigned_to">{{ trans('general.checked_out_to') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="checkout_notes">{{ trans('general.notes') }}</th>
|
|
<th data-searchable="false" data-formatter="dateDisplayFormatter" data-sortable="false" data-field="last_checkout">{{ trans('admin/hardware/table.checkout_date') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="actions" data-formatter="accessoriesInOutFormatter">{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
</div><!--col-md-9-->
|
|
</div> <!-- close tab-pane div -->
|
|
</div>
|
|
</div>
|
|
|
|
<!-- history tab pane -->
|
|
<div class="tab-pane fade" id="history">
|
|
<div class="table table-responsive">
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<table
|
|
class="table table-striped snipe-table"
|
|
data-cookie-id-table="AccessoryHistoryTable"
|
|
data-id-table="AccessoryHistoryTable"
|
|
id="AccessoryHistoryTable"
|
|
data-pagination="true"
|
|
data-show-columns="true"
|
|
data-side-pagination="server"
|
|
data-show-refresh="true"
|
|
data-show-export="true"
|
|
data-sort-order="desc"
|
|
data-export-options='{
|
|
"fileName": "export-{{ str_slug($accessory->name) }}-history-{{ date('Y-m-d') }}",
|
|
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
|
}'
|
|
data-url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}">
|
|
|
|
<thead>
|
|
<tr>
|
|
<th class="col-sm-2" data-visible="false" data-sortable="true" data-field="created_at" data-formatter="dateDisplayFormatter">{{ trans('general.record_created') }}</th>
|
|
<th class="col-sm-2"data-visible="true" data-sortable="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
|
|
<th class="col-sm-2" data-sortable="true" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>
|
|
<th class="col-sm-2" data-field="file" data-visible="false" data-formatter="fileUploadNameFormatter">{{ trans('general.file_name') }}</th>
|
|
<th class="col-sm-2" data-sortable="true" data-visible="true" data-field="item" data-formatter="polymorphicItemFormatter">{{ trans('general.item') }}</th>
|
|
<th class="col-sm-2" data-visible="true" data-field="target" data-formatter="polymorphicItemFormatter">{{ trans('general.target') }}</th>
|
|
<th class="col-sm-2" data-sortable="true" data-visible="true" data-field="note">{{ trans('general.notes') }}</th>
|
|
<th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
|
|
@if ($snipeSettings->require_accept_signature=='1')
|
|
<th class="col-md-3" data-field="signature_file" data-visible="false" data-formatter="imageFormatter">{{ trans('general.signature') }}</th>
|
|
@endif
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
</div> <!-- /.col-md-12-->
|
|
</div> <!-- /.row-->
|
|
</div><!--tab history-->
|
|
</div>
|
|
|
|
|
|
|
|
@can('accessories.files', $accessory)
|
|
<div class="tab-pane" id="files">
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<x-filestable
|
|
filepath="private_uploads/accessories/"
|
|
showfile_routename="show.accessoryfile"
|
|
deletefile_routename="delete/accessoryfile"
|
|
:object="$accessory" />
|
|
</div>
|
|
</div>
|
|
</div> <!-- /.tab-pane -->
|
|
@endcan
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<!-- side address column -->
|
|
|
|
<div class="col-md-3">
|
|
|
|
@if ($accessory->image!='')
|
|
<div class="row">
|
|
<div class="col-md-12 text-center" style="padding-bottom: 15px;">
|
|
<a href="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" data-toggle="lightbox"><img src="{{ Storage::disk('public')->url('accessories/'.e($accessory->image)) }}" class="img-responsive img-thumbnail" alt="{{ $accessory->name }}"></a>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@if ($accessory->company)
|
|
<div class="row">
|
|
<div class="col-md-3" style="padding-bottom: 15px;">
|
|
<strong> {{ trans('general.company')}}</strong>
|
|
</div>
|
|
<div class="col-md-9">
|
|
<a href="{{ route('companies.show', $accessory->company->id) }}">{{ $accessory->company->name }} </a>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
|
|
@if ($accessory->category)
|
|
<div class="row">
|
|
<div class="col-md-3" style="padding-bottom: 10px;">
|
|
<strong>{{ trans('general.category')}}</strong>
|
|
</div>
|
|
<div class="col-md-9">
|
|
<a href="{{ route('categories.show', $accessory->category->id) }}">{{ $accessory->category->name }} </a>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
|
|
@if ($accessory->notes)
|
|
<div class="row">
|
|
<div class="col-md-3" style="padding-bottom: 10px;">
|
|
<strong>
|
|
{{ trans('general.notes') }}
|
|
</strong>
|
|
</div>
|
|
<div class="col-md-9" style="word-wrap: break-word;">
|
|
{!! nl2br(Helper::parseEscapedMarkedownInline($accessory->notes)) !!}
|
|
</div>
|
|
</div>
|
|
|
|
@endif
|
|
|
|
|
|
<div class="row">
|
|
<div class="col-md-3" style="padding-bottom: 10px;">
|
|
<strong>{{ trans('admin/accessories/general.remaining') }}</strong>
|
|
</div>
|
|
<div class="col-md-9">
|
|
{{ $accessory->numRemaining() }}
|
|
</div>
|
|
</div>
|
|
|
|
<div class="row">
|
|
<div class="col-md-3" style="padding-bottom: 10px;">
|
|
<strong>{{ trans('general.checked_out') }}</strong>
|
|
</div>
|
|
<div class="col-md-9">
|
|
{{ $accessory->checkouts_count }}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="col-md-3 pull-right">
|
|
|
|
@can('update', \App\Models\Accessory::class)
|
|
<div class="text-center" style="padding-top:5px;">
|
|
<a href="{{ route('accessories.edit', $accessory->id) }}" style="margin-right:5px;" class="btn btn-warning btn-sm btn-social btn-block hidden-print">
|
|
<x-icon type="edit" />
|
|
{{ trans('admin/accessories/general.edit') }}
|
|
</a>
|
|
</div>
|
|
@endcan
|
|
|
|
@can('checkout', \App\Models\Accessory::class)
|
|
<div class="text-center" style="padding-top:5px;">
|
|
<a href="{{ route('accessories.checkout.show', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn bg-maroon btn-sm btn-social btn-block hidden-print {{ (($accessory->numRemaining() > 0 ) ? '' : ' disabled') }}">
|
|
<x-icon type="checkout" />
|
|
{{ trans('general.checkout') }}
|
|
</a>
|
|
</div>
|
|
@endcan
|
|
|
|
@can('create', \App\Models\Accessory::class)
|
|
<div class="text-center" style="padding-top:5px;">
|
|
<a href="{{ route('clone/accessories', $accessory->id) }}" style="margin-right:5px; width:100%" class="btn btn-info btn-block btn-sm btn-social hidden-print">
|
|
<x-icon type="clone" />
|
|
{{ trans('admin/accessories/general.clone') }}</a>
|
|
</div>
|
|
@endcan
|
|
|
|
@can('delete', $accessory)
|
|
@if ($accessory->checkouts_count == 0)
|
|
<div class="text-center" style="padding-top:5px;">
|
|
<button class="btn btn-block btn-danger btn-sm btn-social delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
|
|
<x-icon type="delete" />
|
|
{{ trans('general.delete') }}
|
|
</button>
|
|
</div>
|
|
@else
|
|
<div class="text-center" style="padding-top:5px;">
|
|
<span data-tooltip="true" title=" {{ trans('admin/accessories/general.delete_disabled') }}">
|
|
<a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-asset disabled">
|
|
<x-icon type="delete" />
|
|
{{ trans('general.delete') }}
|
|
</a>
|
|
</span>
|
|
</div>
|
|
@endif
|
|
@endcan
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
@can('accessories.files', Accessory::class)
|
|
@include ('modals.upload-file', ['item_type' => 'accessory', 'item_id' => $accessory->id])
|
|
@endcan
|
|
@stop
|
|
|
|
|
|
|
|
|
|
@section('moar_scripts')
|
|
<script>
|
|
$('#dataConfirmModal').on('show.bs.modal', function (event) {
|
|
var content = $(event.relatedTarget).data('content');
|
|
var title = $(event.relatedTarget).data('title');
|
|
$(this).find(".modal-body").text(content);
|
|
$(this).find(".modal-header").text(title);
|
|
});
|
|
</script>
|
|
@include ('partials.bootstrap-table')
|
|
@stop
|