mirror of
https://github.com/snipe/snipe-it.git
synced 2026-02-04 08:05:23 +00:00
Merge remote-tracking branch 'origin/develop'
This commit is contained in:
snipe
@ -13,124 +13,118 @@
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="row"><!-- .row -->
|
||||
<div class="col-md-12"><!-- .col-md-12 -->
|
||||
<div class="box box-default"><!-- .box -->
|
||||
<div class="box-body"><!-- .bow-body -->
|
||||
<div class="row"><!-- .row -->
|
||||
<div class="col-md-12"><!-- col-md-12 -->
|
||||
|
||||
<table
|
||||
data-toolbar="#toolbar"
|
||||
class="table table-striped snipe-table"
|
||||
id="requestedAssets"
|
||||
data-id-table="requestedAssets"
|
||||
data-cookie-id-table="requestedAssets"
|
||||
data-export-options='{
|
||||
"fileName": "export-assetrequests-{{ date('Y-m-d') }}",
|
||||
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
||||
}'>
|
||||
<thead>
|
||||
<tr role="row">
|
||||
<th class="col-md-1">{{ trans('general.image') }}</th>
|
||||
<th class="col-md-2">{{ trans('general.name') }}</th>
|
||||
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
|
||||
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
|
||||
<th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
|
||||
<th class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
|
||||
<th class="col-md-1">{{ trans('button.actions') }}</th>
|
||||
<th class="col-md-1">{{ trans('general.checkout') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($requestedItems as $request)
|
||||
<table
|
||||
data-toolbar="#toolbar"
|
||||
class="table table-striped snipe-table"
|
||||
id="requestedAssets"
|
||||
data-id-table="requestedAssets"
|
||||
data-cookie-id-table="requestedAssets"
|
||||
data-export-options='{
|
||||
"fileName": "export-assetrequests-{{ date('Y-m-d') }}",
|
||||
"ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
|
||||
}'>
|
||||
<thead>
|
||||
<tr role="row">
|
||||
<th class="col-md-1">{{ trans('general.image') }}</th>
|
||||
<th class="col-md-2">{{ trans('general.name') }}</th>
|
||||
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/table.location') }}</th>
|
||||
<th class="col-md-2" data-sortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
|
||||
<th class="col-md-3" data-sortable="true">{{ trans('admin/hardware/table.requesting_user') }}</th>
|
||||
<th class="col-md-2">{{ trans('admin/hardware/table.requested_date') }}</th>
|
||||
<th class="col-md-1">{{ trans('button.actions') }}</th>
|
||||
<th class="col-md-1">{{ trans('general.checkout') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($requestedItems as $request)
|
||||
|
||||
@if ($request->requestable)
|
||||
<tr>
|
||||
{{ csrf_field() }}
|
||||
<td>
|
||||
@if (($request->itemType() == "asset") && ($request->requestable))
|
||||
<a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
|
||||
@elseif (($request->itemType() == "asset_model") && ($request->requestable))
|
||||
<a href="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" data-toggle="lightbox" data-type="image"><img src="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
|
||||
@endif
|
||||
@if ($request->requestable)
|
||||
<tr>
|
||||
{{ csrf_field() }}
|
||||
<td>
|
||||
@if (($request->itemType() == "asset") && ($request->requestable))
|
||||
<a href="{{ $request->requestable->getImageUrl() }}" data-toggle="lightbox" data-type="image"><img src="{{ $request->requestable->getImageUrl() }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
|
||||
@elseif (($request->itemType() == "asset_model") && ($request->requestable))
|
||||
<a href="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" data-toggle="lightbox" data-type="image"><img src="{{ config('app.url') }}/uploads/models/{{ $request->requestable->image }}" style="max-height: {{ $snipeSettings->thumbnail_max_h }}px; width: auto;" class="img-responsive" alt="{{ $request->requestable->name }}"></a>
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
|
||||
@if ($request->itemType() == "asset")
|
||||
<a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}">
|
||||
{{ $request->name() }}
|
||||
</a>
|
||||
@elseif ($request->itemType() == "asset_model")
|
||||
<a href="{{ config('app.url') }}/models/{{ $request->requestable->id }}">
|
||||
{{ $request->name() }}
|
||||
</a>
|
||||
@endif
|
||||
|
||||
</td>
|
||||
<td>
|
||||
</td>
|
||||
<td>
|
||||
{{ $request->location() ? $request->location()->name : '' }}
|
||||
</td>
|
||||
|
||||
@if ($request->itemType() == "asset")
|
||||
<a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}">
|
||||
{{ $request->name() }}
|
||||
</a>
|
||||
@elseif ($request->itemType() == "asset_model")
|
||||
<a href="{{ config('app.url') }}/models/{{ $request->requestable->id }}">
|
||||
{{ $request->name() }}
|
||||
</a>
|
||||
@endif
|
||||
<td>
|
||||
@if ($request->itemType() == "asset")
|
||||
{{ App\Helpers\Helper::getFormattedDateObject($request->requestable->expected_checkin, 'datetime', false) }}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if ($request->requestingUser() && !$request->requestingUser()->trashed())
|
||||
<a href="{{ config('app.url') }}/users/{{ $request->requestingUser()->id }}">
|
||||
{{ $request->requestingUser()->display_name }}
|
||||
</a>
|
||||
@else
|
||||
{{ trans('admin/reports/general.deleted_user') }}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
{{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }}
|
||||
</td>
|
||||
<td>
|
||||
<form
|
||||
method="POST"
|
||||
action="{{ route('account/request-item', [
|
||||
$request->itemType(),
|
||||
$request->requestable->id,
|
||||
true,
|
||||
$request->requestingUser()->id
|
||||
]) }}"
|
||||
accept-charset="UTF-8"
|
||||
>
|
||||
@csrf
|
||||
<button class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.cancel_request') }}">{{ trans('button.cancel') }}</button>
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
@if ($request->itemType() == "asset")
|
||||
@if ($request->requestable->assigned_to=='')
|
||||
<a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_user_tooltip') }}">{{ trans('general.checkout') }}</a>
|
||||
@else
|
||||
<a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_toolip') }}">{{ trans('general.checkin') }}</a>
|
||||
@endif
|
||||
@endif
|
||||
</td>
|
||||
|
||||
</td>
|
||||
@if ($request->location())
|
||||
<td>{{ $request->location()->name }}</td>
|
||||
@else
|
||||
<td></td>
|
||||
@endif
|
||||
|
||||
<td>
|
||||
@if ($request->itemType() == "asset")
|
||||
{{ App\Helpers\Helper::getFormattedDateObject($request->requestable->expected_checkin, 'datetime', false) }}
|
||||
@endif
|
||||
</td>
|
||||
<td>
|
||||
@if ($request->requestingUser() && !$request->requestingUser()->trashed())
|
||||
<a href="{{ config('app.url') }}/users/{{ $request->requestingUser()->id }}">
|
||||
{{ $request->requestingUser()->display_name }}
|
||||
</a>
|
||||
@else
|
||||
(deleted user)
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ App\Helpers\Helper::getFormattedDateObject($request->created_at, 'datetime', false) }}</td>
|
||||
<td>
|
||||
<form
|
||||
method="POST"
|
||||
action="{{ route('account/request-item', [
|
||||
$request->itemType(),
|
||||
$request->requestable->id,
|
||||
true,
|
||||
$request->requestingUser()->id
|
||||
]) }}"
|
||||
accept-charset="UTF-8"
|
||||
>
|
||||
@csrf
|
||||
<button class="btn btn-warning btn-sm" data-tooltip="true" title="{{ trans('general.cancel_request') }}">{{ trans('button.cancel') }}</button>
|
||||
</form>
|
||||
</td>
|
||||
<td>
|
||||
@if ($request->itemType() == "asset")
|
||||
@if ($request->requestable->assigned_to=='')
|
||||
<a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_user_tooltip') }}">{{ trans('general.checkout') }}</a>
|
||||
@else
|
||||
<a href="{{ config('app.url') }}/hardware/{{ $request->requestable->id }}/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="{{ trans('general.checkin_toolip') }}">{{ trans('general.checkin') }}</a>
|
||||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@endif
|
||||
</td>
|
||||
|
||||
|
||||
</tr>
|
||||
@endif
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div> <!-- .col-md-12> -->
|
||||
</div> <!-- /.col-md-12 -->
|
||||
</div> <!-- /.row -->
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
</div> <!-- .col-md-12 -->
|
||||
</div> <!-- .row -->
|
||||
@stop
|
||||
|
||||
|
||||
@ -5,121 +5,113 @@
|
||||
@parent
|
||||
@stop
|
||||
|
||||
|
||||
@section('header_right')
|
||||
<a href="{{ URL::previous() }}" class="btn btn-primary pull-right">
|
||||
{{ trans('general.back') }}</a>
|
||||
@stop
|
||||
|
||||
|
||||
{{-- Page content --}}
|
||||
@section('content')
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
@if ($snipeSettings->ldap_enabled == 0)
|
||||
{{ trans('admin/users/message.ldap_not_configured') }}
|
||||
@else
|
||||
<form class="form-horizontal" role="form" method="post" action="" id="ldap-form">
|
||||
{{csrf_field()}}
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
@if ($snipeSettings->ldap_enabled == 0)
|
||||
{{ trans('admin/users/message.ldap_not_configured') }}
|
||||
@else
|
||||
|
||||
<div class="callout callout-legend col-md-12">
|
||||
<p>
|
||||
<i class="fa-solid fa-lightbulb"></i>
|
||||
<strong>{!! trans('admin/users/general.ldap_sync_intro', ['link' => 'https://snipe-it.readme.io/docs/ldap-sync#/']) !!}</strong>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<!-- location_id-->
|
||||
<div class="form-group {{ $errors->has('location_id') ? 'has-error' : '' }}">
|
||||
<!-- Location -->
|
||||
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.ldap_sync_location'), 'help_text' => trans('admin/users/general.ldap_config_text'), 'fieldname' => 'location_id[]', 'multiple' => true])
|
||||
</div>
|
||||
</div><!-- ./box-body -->
|
||||
<div class="box-footer">
|
||||
<div class="text-left col-md-6">
|
||||
<a class="btn btn-link" href="{{ route('users.index') }}">{{ trans('button.cancel') }}</a>
|
||||
</div>
|
||||
<div class="text-right col-md-6">
|
||||
<button type="submit" class="btn btn-primary" id="sync">
|
||||
<i id="sync-button-icon" class="fas fa-sync-alt icon-white" aria-hidden="true"></i> <span id="sync-button-text">{{ trans('general.synchronize') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div> <!-- ./box-footer -->
|
||||
<div class="box box-default">
|
||||
<form class="form-horizontal" role="form" method="post" action="" id="ldap-form">
|
||||
{{csrf_field()}}
|
||||
<div class="box-body">
|
||||
<div class="callout callout-legend col-md-12">
|
||||
<p>
|
||||
<i class="fa-solid fa-lightbulb text-info"></i>
|
||||
<strong>
|
||||
{!! trans('admin/users/general.ldap_sync_intro', ['link' => 'https://snipe-it.readme.io/docs/ldap-sync#/']) !!}
|
||||
</strong>
|
||||
</p>
|
||||
</div>
|
||||
<!-- Location -->
|
||||
@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.ldap_sync_location'), 'help_text' => trans('admin/users/general.ldap_config_text'), 'fieldname' => 'location_id[]', 'multiple' => true])
|
||||
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
</div><!-- ./box-body -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="box-footer">
|
||||
<div class="text-left col-md-6">
|
||||
<a class="btn btn-link" href="{{ route('users.index') }}">{{ trans('button.cancel') }}</a>
|
||||
</div>
|
||||
<div class="text-right col-md-6">
|
||||
<button type="submit" class="btn btn-primary" id="sync">
|
||||
<i id="sync-button-icon" class="fas fa-sync-alt icon-white" aria-hidden="true"></i> <span id="sync-button-text">{{ trans('general.synchronize') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div> <!-- ./box-footer -->
|
||||
</form>
|
||||
</div><!-- /.box -->
|
||||
|
||||
@endif
|
||||
</div><!-- /.col-md-8 -->
|
||||
</div><!-- /.row -->
|
||||
|
||||
@if (Session::get('summary'))
|
||||
<div class="row">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
<div class="col-md-8 col-md-offset-2">
|
||||
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h2 class="box-title">{{ trans('general.sync_results') }}</h2>
|
||||
</div><!-- /.box-header -->
|
||||
<div class="box-body">
|
||||
<table
|
||||
data-cookie-id-table="ldapUserSync"
|
||||
data-id-table="ldapUserSyncTable"
|
||||
data-side-pagination="client"
|
||||
data-sort-order="asc"
|
||||
data-sort-name="username"
|
||||
data-show-refresh="false"
|
||||
id="customFieldsTable"
|
||||
data-advanced-search="false"
|
||||
class="table table-striped snipe-table"
|
||||
data-export-options='{
|
||||
"fileName": "ldap-sync-results-{{ date('Y-m-d') }}"
|
||||
<div class="box box-default">
|
||||
<div class="box-header with-border">
|
||||
<h2 class="box-title">
|
||||
{{ trans('general.sync_results') }}
|
||||
</h2>
|
||||
</div><!-- /.box-header -->
|
||||
|
||||
<div class="box-body"><!-- .box-body -->
|
||||
<table
|
||||
data-cookie-id-table="ldapUserSync"
|
||||
data-id-table="ldapUserSyncTable"
|
||||
data-side-pagination="client"
|
||||
data-sort-order="asc"
|
||||
data-sort-name="username"
|
||||
data-show-refresh="false"
|
||||
id="customFieldsTable"
|
||||
data-advanced-search="false"
|
||||
class="table table-striped snipe-table"
|
||||
data-export-options='{
|
||||
"fileName": "ldap-sync-results-{{ date('Y-m-d') }}"
|
||||
}'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortable="true" data-visible="false" data-searchable="true">{{ trans('general.id') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.username') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('admin/users/table.display_name') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.employee_number') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.first_name') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.last_name') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.email') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.notes') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<thead>
|
||||
<tr>
|
||||
<th data-sortable="true" data-visible="false" data-searchable="true">{{ trans('general.id') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.username') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('admin/users/table.display_name') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.employee_number') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.first_name') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.last_name') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.email') }}</th>
|
||||
<th data-sortable="true" data-visible="true" data-searchable="true">{{ trans('general.notes') }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
@foreach (Session::get('summary') as $entry)
|
||||
<tr>
|
||||
<td>{{ (array_key_exists('id', $entry)) ? $entry['id'] : '' }}</td>
|
||||
<td>{{ $entry['username'] }}</td>
|
||||
<td>{{ $entry['display_name'] }}</td>
|
||||
<td>{{ $entry['employee_number'] }}</td>
|
||||
<td>{{ $entry['firstname'] }}</td>
|
||||
<td>{{ $entry['lastname'] }}</td>
|
||||
<td>{{ $entry['email'] }}</td>
|
||||
<td>
|
||||
@if ($entry['status']=='success')
|
||||
<span class="text-success"><i class="fas fa-check"></i> {!! $entry['note'] !!}</span>
|
||||
@else
|
||||
<span class="alert-msg" aria-hidden="true">{!! $entry['note'] !!}</span>
|
||||
@endif
|
||||
@foreach (Session::get('summary') as $entry)
|
||||
<tr>
|
||||
<td>{{ (array_key_exists('id', $entry)) ? $entry['id'] : '' }}</td>
|
||||
<td>{{ $entry['username'] }}</td>
|
||||
<td>{{ $entry['display_name'] }}</td>
|
||||
<td>{{ $entry['employee_number'] }}</td>
|
||||
<td>{{ $entry['firstname'] }}</td>
|
||||
<td>{{ $entry['lastname'] }}</td>
|
||||
<td>{{ $entry['email'] }}</td>
|
||||
<td>
|
||||
@if ($entry['status']=='success')
|
||||
<span class="text-success"><i class="fas fa-check"></i> {!! $entry['note'] !!}</span>
|
||||
@else
|
||||
<span class="alert-msg" aria-hidden="true">{!! $entry['note'] !!}</span>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div><!-- /.box-body -->
|
||||
</div><!-- /.box -->
|
||||
</div><!-- /.col-md-12 -->
|
||||
</div><!-- /.row -->
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@stop
|
||||
|
||||
Reference in New Issue
Block a user