From 03c90d7b607eebbbaa506f8dad3953debcd2ab21 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Mon, 9 Dec 2024 13:29:06 -0600 Subject: [PATCH 1/4] note, will come back to this once question is answered --- resources/views/partials/bootstrap-table.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index f24552d753..0d64095235 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -279,8 +279,8 @@ element_name = ''; } - return function (value,row) { + return function (value,row) { var actions = ''; // Add some overrides for any funny urls we have @@ -442,6 +442,7 @@ function genericCheckinCheckoutFormatter(destination) { return function (value,row) { + // some extra logic for kits needs to go here // The user is allowed to check items out, AND the item is deployable if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) { From 72f58b04053df3527ddfaeb36116aa0242634cf5 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Wed, 11 Dec 2024 19:13:51 -0600 Subject: [PATCH 2/4] leaving this here for notes etc --- resources/views/partials/bootstrap-table.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 0d64095235..f7c2628e30 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -441,10 +441,14 @@ } function genericCheckinCheckoutFormatter(destination) { + console.log(destination) return function (value,row) { + console.log(value) + console.log(row.user_can_checkout) // some extra logic for kits needs to go here // 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))) { return '{{ trans('general.checkout') }}'; From eb054897d637a6f63b1a7e26f2360e962a9de16f Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 17 Dec 2024 16:06:10 -0600 Subject: [PATCH 3/4] Remove leftover testing logic and fix checkout permissions 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. --- app/Http/Transformers/PredefinedKitsTransformer.php | 4 +++- resources/views/partials/bootstrap-table.blade.php | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Http/Transformers/PredefinedKitsTransformer.php b/app/Http/Transformers/PredefinedKitsTransformer.php index b5de12fc08..61a0241571 100644 --- a/app/Http/Transformers/PredefinedKitsTransformer.php +++ b/app/Http/Transformers/PredefinedKitsTransformer.php @@ -3,6 +3,8 @@ namespace App\Http\Transformers; use App\Helpers\Helper; +use App\Models\Asset; +use App\Models\AssetModel; use App\Models\PredefinedKit; use App\Models\SnipeModel; use Illuminate\Support\Facades\Gate; @@ -42,7 +44,7 @@ class PredefinedKitsTransformer $permissions_array['available_actions'] = [ 'update' => Gate::allows('update', 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), // 'restore' => Gate::allows('create', PredefinedKit::class), ]; diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index f7c2628e30..0d64095235 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -441,14 +441,10 @@ } function genericCheckinCheckoutFormatter(destination) { - console.log(destination) return function (value,row) { - console.log(value) - console.log(row.user_can_checkout) // some extra logic for kits needs to go here // 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))) { return '{{ trans('general.checkout') }}'; From 7eb936883aa00c8d860a7eb5657877ce88550e79 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Tue, 17 Dec 2024 16:38:29 -0600 Subject: [PATCH 4/4] rm note --- app/Http/Transformers/PredefinedKitsTransformer.php | 1 - resources/views/partials/bootstrap-table.blade.php | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Http/Transformers/PredefinedKitsTransformer.php b/app/Http/Transformers/PredefinedKitsTransformer.php index 61a0241571..61c9e476a9 100644 --- a/app/Http/Transformers/PredefinedKitsTransformer.php +++ b/app/Http/Transformers/PredefinedKitsTransformer.php @@ -4,7 +4,6 @@ namespace App\Http\Transformers; use App\Helpers\Helper; use App\Models\Asset; -use App\Models\AssetModel; use App\Models\PredefinedKit; use App\Models\SnipeModel; use Illuminate\Support\Facades\Gate; diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 0d64095235..6608afe8e8 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -441,8 +441,7 @@ } function genericCheckinCheckoutFormatter(destination) { - return function (value,row) { - // some extra logic for kits needs to go here + return function (value, row) { // The user is allowed to check items out, AND the item is deployable if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {