mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 06:04:08 -08:00
Front-end updates for checkin without delete
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
32010d5387
commit
458d61fafe
|
@ -42,6 +42,7 @@
|
||||||
<th class="col-md-5">{{ trans('general.assets') }}</th>
|
<th class="col-md-5">{{ trans('general.assets') }}</th>
|
||||||
<th class="col-md-5">{{ trans('general.accessories') }}</th>
|
<th class="col-md-5">{{ trans('general.accessories') }}</th>
|
||||||
<th class="col-md-5">{{ trans('general.licenses') }}</th>
|
<th class="col-md-5">{{ trans('general.licenses') }}</th>
|
||||||
|
<th class="col-md-5">{{ trans('general.consumables') }}</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
|
@ -49,14 +50,14 @@
|
||||||
<tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
|
<tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
|
||||||
<td>
|
<td>
|
||||||
@if (Auth::id()!=$user->id)
|
@if (Auth::id()!=$user->id)
|
||||||
<input type="checkbox" name="ids[]" value="{{ $user->id }}" checked="checked">
|
<input type="checkbox" name="ids[]" value="{{ $user->id }}" class="minimal" checked="checked">
|
||||||
@else
|
@else
|
||||||
<input type="checkbox" name="ids[]" value="{{ $user->id }}" disabled>
|
<input type="checkbox" name="ids[]" value="{{ $user->id }}" class="minimal" disabled>
|
||||||
@endif
|
@endif
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td>
|
<td>
|
||||||
<span {{ (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') }}>
|
<span {!! (Auth::user()->id==$user->id ? ' style="text-decoration: line-through"' : '') !!}>
|
||||||
{{ $user->present()->fullName() }} ({{ $user->username }})
|
{{ $user->present()->fullName() }} ({{ $user->username }})
|
||||||
</span>
|
</span>
|
||||||
{{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }}
|
{{ (Auth::id()==$user->id ? ' (cannot delete yourself)' : '') }}
|
||||||
|
@ -77,19 +78,26 @@
|
||||||
<td>
|
<td>
|
||||||
{{ number_format($user->licenses()->count()) }}
|
{{ number_format($user->licenses()->count()) }}
|
||||||
</td>
|
</td>
|
||||||
|
<td>
|
||||||
|
{{ number_format($user->consumables()->count()) }}
|
||||||
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@endforeach
|
@endforeach
|
||||||
</tbody>
|
</tbody>
|
||||||
<tfoot>
|
<tfoot>
|
||||||
|
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="6" class="warning">
|
<td colspan="7">
|
||||||
{{ Form::select('status_id', $statuslabel_list , Request::old('status_id'), array('class'=>'select2', 'style'=>'width:250px')) }}
|
{{ Form::select('status_id', $statuslabel_list , Request::old('status_id'), array('class'=>'select2', 'style'=>'width:250px')) }}
|
||||||
<label>{{ trans('admin/users/general.update_user_assets_status') }}</label></label>
|
<label>{{ trans('admin/users/general.update_user_assets_status') }}</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="6" class="warning">
|
<td colspan="7" class="text-danger">
|
||||||
<label><input type="checkbox" name="ids['.e($user->id).']" checked>{{ trans('admin/users/general.checkin_user_properties') }}</label>
|
<label>
|
||||||
|
<input type="checkbox" name="delete_user" value="1" class="minimal">
|
||||||
|
<i class="fa fa-warning text-danger"></i> {{ trans('general.bulk_soft_delete') }}
|
||||||
|
</label>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tfoot>
|
</tfoot>
|
||||||
|
|
Loading…
Reference in a new issue