Skip to content

Commit

Permalink
Merge pull request #15023 from snipe/improvements/optimize_queries_fo…
Browse files Browse the repository at this point in the history 
…r_user_bulk_actions

Added files column to bulk user delete, optimized queries
  • Loading branch information
@snipe
snipe authored Jul 3, 2024
2 parents a6d0450 + 708d7b5 commit da01487
Showing 1 changed file with 35 additions and 16 deletions.
51 changes: 35 additions & 16 deletions resources/views/users/confirm-bulk-delete.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,28 @@
<th class="col-md-1">
<!-- <input type="checkbox" id="checkAll"> -->
</th>
<th class="col-md-6">{{ trans('general.name') }}</th>
<th class="col-md-5">{{ trans('general.groups') }}</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.licenses') }}</th>
<th class="col-md-5">{{ trans('general.consumables') }}</th>
<th class="col-md-3">{{ trans('general.name') }}</th>
<th class="col-md-3">{{ trans('general.groups') }}</th>
<th class="text-right">
<i class="fas fa-barcode fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.assets') }}</span>
</th>
<th class="text-right">
<i class="far fa-keyboard fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.accessories') }}</span>
</th>
<th class="text-right">
<i class="far fa-save fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.licenses') }}</span>
</th>
<th class="text-right">
<i class="fas fa-tint fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.consumables') }}</span>
</th>
<th class="text-right">
<i class="fas fa-paperclip fa-fw" aria-hidden="true" style="font-size: 17px;"></i>
<span class="sr-only">{{ trans('general.files') }}</span>
</th>
</tr>
</thead>
<tbody>
Expand All @@ -71,31 +87,34 @@
</a>&nbsp;
@endforeach
</td>
<td>
{{ number_format($user->assets()->count()) }}
<td class="text-right">
{{ number_format($user->assets->count()) }}
</td>
<td>
{{ number_format($user->accessories()->count()) }}
<td class="text-right">
{{ number_format($user->accessories->count()) }}
</td>
<td>
{{ number_format($user->licenses()->count()) }}
<td class="text-right">
{{ number_format($user->licenses->count()) }}
</td>
<td>
{{ number_format($user->consumables()->count()) }}
<td class="text-right">
{{ number_format($user->consumables->count()) }}
</td>
<td class="text-right">
{{ number_format($user->uploads->count()) }}
</td>
</tr>
@endforeach
</tbody>
<tfoot>

<tr>
<td colspan="7">
<td colspan="8">
{{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', 'style'=>'width:250px')) }}
<label>{{ trans('admin/users/general.update_user_assets_status') }}</label>
</td>
</tr>
<tr>
<td colspan="7" class="col-md-12 alert-danger">
<td colspan="8" class="col-md-12 alert-danger">
<label class="form-control">
<input type="checkbox" name="delete_user" value="1">
<span><i class="fa fa-warning fa-2x"></i> {{ trans('general.bulk_soft_delete') }}</span>
Expand Down

0 comments on commit da01487

Please sign in to comment.