DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Remove leftover testing logic and fix checkout permissions

Browse source 
Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit.
This commit is contained in:
spencerrlongg 2024-12-17 16:06:10 -06:00
parent 72f58b0405
commit eb054897d6
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Transformers/PredefinedKitsTransformer.php
View file

@ -3,6 +3,8 @@
namespace App\Http\Transformers; namespace App\Http\Transformers;
use App\Helpers\Helper; use App\Helpers\Helper;
use App\Models\Asset;
use App\Models\AssetModel;
use App\Models\PredefinedKit; use App\Models\PredefinedKit;
use App\Models\SnipeModel; use App\Models\SnipeModel;
use Illuminate\Support\Facades\Gate; use Illuminate\Support\Facades\Gate;
@ -42,7 +44,7 @@ class PredefinedKitsTransformer
$permissions_array['available_actions'] = [ $permissions_array['available_actions'] = [
'update' => Gate::allows('update', PredefinedKit::class), 'update' => Gate::allows('update', PredefinedKit::class),
'delete' => Gate::allows('delete', PredefinedKit::class), 'delete' => Gate::allows('delete', PredefinedKit::class),
'checkout' => Gate::allows('checkout', PredefinedKit::class), 'checkout' => Gate::allows('checkout', Asset::class),
// 'clone' => Gate::allows('create', PredefinedKit::class), // 'clone' => Gate::allows('create', PredefinedKit::class),
// 'restore' => Gate::allows('create', PredefinedKit::class), // 'restore' => Gate::allows('create', PredefinedKit::class),
]; ];

4
resources/views/partials/bootstrap-table.blade.php
View file

@ -441,14 +441,10 @@
} }
function genericCheckinCheckoutFormatter(destination) { function genericCheckinCheckoutFormatter(destination) {
console.log(destination)
return function (value,row) { return function (value,row) {
console.log(value)
console.log(row.user_can_checkout)
// some extra logic for kits needs to go here // some extra logic for kits needs to go here
// The user is allowed to check items out, AND the item is deployable // The user is allowed to check items out, AND the item is deployable
row.available_actions.checkout = true //this is for testing -- TODO: REMOVE!!!!
if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) { if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>'; return '<a href="{{ config('app.url') }}/' + destination + '/' + row.id + '/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="{{ trans('general.checkout_tooltip') }}">{{ trans('general.checkout') }}</a>';