From 860e7791ffe72545ad9f329094a65306a5f40206 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 23:35:44 +0100 Subject: [PATCH] Fixed #13592 - unable to delete model from view page Signed-off-by: snipe --- resources/lang/en/general.php | 2 ++ resources/views/models/view.blade.php | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index b638682b1426..c239214d8325 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -268,6 +268,8 @@ 'supplier' => 'Supplier', 'suppliers' => 'Suppliers', 'sure_to_delete' => 'Are you sure you wish to delete', + 'sure_to_delete_var' => 'Are you sure you wish to delete :item?', + 'delete_what' => 'Delete :item', 'submit' => 'Submit', 'target' => 'Target', 'time_and_date_display' => 'Time and Date Display', diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index 3a5fd9a6ba40..99a22b00e6f0 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -339,12 +339,12 @@ class="table table-striped snipe-table" @if ($model->assets->count() > 0)
- {{ trans('general.delete') }} +
@else -
- {{ trans('general.delete') }} + + {{ trans('general.delete') }}
@endif @endcan @@ -357,6 +357,16 @@ class="table table-striped snipe-table" @stop @section('moar_scripts') + + + @include ('partials.bootstrap-table', ['exportFile' => 'manufacturer' . $model->name . '-export', 'search' => false]) @stop