From 30192f5b14953c1ac8bfe869f46917b2e70d24ff Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Fri, 1 Aug 2025 21:11:54 +0100
Subject: [PATCH] Removed extra modal code

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/accessories/view.blade.php       | 13 +------------
 resources/views/consumables/view.blade.php       | 14 +-------------
 resources/views/custom_fields/index.blade.php    |  4 ++--
 resources/views/hardware/view.blade.php          | 10 ----------
 resources/views/licenses/view.blade.php          | 16 +++-------------
 resources/views/models/view.blade.php            | 11 +----------
 .../views/partials/bootstrap-table.blade.php     |  2 +-
 resources/views/reports/custom.blade.php         |  8 +-------
 8 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index d51795f23d..ddecbaac54 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -334,7 +334,7 @@
         @can('delete', $accessory)
             @if ($accessory->checkouts_count == 0)
                 <div class="text-center" style="padding-top:5px;">
-                    <button class="btn btn-block btn-danger btn-sm btn-social delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal">
+                    <button class="btn btn-block btn-danger btn-sm btn-social delete-asset" style="padding-top:5px;" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm_no_undo', ['item' => $accessory->name]) }}" data-target="#dataConfirmModal" onClick="return false;">
                         <x-icon type="delete" />
                     {{ trans('general.delete') }}
                     </button>
@@ -360,17 +360,6 @@
 @endcan
 @stop
 
-
-
-
 @section('moar_scripts')
-    <script>
-        $('#dataConfirmModal').on('show.bs.modal', function (event) {
-            var content = $(event.relatedTarget).data('content');
-            var title = $(event.relatedTarget).data('title');
-            $(this).find(".modal-body").text(content);
-            $(this).find(".modal-header").text(title);
-        });
-    </script>
 @include ('partials.bootstrap-table')
 @stop
diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 334cd0303e..ba3127b051 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -139,7 +139,7 @@
                   @can('delete', $consumable)
                     <div class="col-md-12" style="padding-top: 10px; padding-bottom: 20px">
                       @if ($consumable->deleted_at=='')
-                        <button class="btn btn-sm btn-block btn-danger btn-social hidden-print delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $consumable->name]) }}" data-target="#dataConfirmModal">
+                        <button class="btn btn-sm btn-block btn-danger btn-social hidden-print delete-asset" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $consumable->name]) }}" data-target="#dataConfirmModal" onClick="return false;">
                           <x-icon type="delete" />
                           {{ trans('general.delete') }}
                         </button>
@@ -482,17 +482,5 @@
 
 @section('moar_scripts')
 
-        <script>
-
-          $('#dataConfirmModal').on('show.bs.modal', function (event) {
-            var content = $(event.relatedTarget).data('content');
-            var title = $(event.relatedTarget).data('title');
-            $(this).find(".modal-body").text(content);
-            $(this).find(".modal-header").text(title);
-          });
-
-        </script>
-
-
   @include ('partials.bootstrap-table', ['simple_view' => true])
 @endsection
\ No newline at end of file
diff --git a/resources/views/custom_fields/index.blade.php b/resources/views/custom_fields/index.blade.php
index 7256c5d808..5bbe0c0c5b 100644
--- a/resources/views/custom_fields/index.blade.php
+++ b/resources/views/custom_fields/index.blade.php
@@ -90,7 +90,7 @@
                   @if($fieldset->models->count() > 0)
                   <button type="submit" class="btn btn-danger btn-sm disabled" data-tooltip="true" title="{{ trans('general.cannot_be_deleted') }}" disabled><i class="fas fa-trash"></i></button>
                   @else
-                  <button type="submit" class="btn btn-danger btn-sm" data-tooltip="true" title="{{ trans('general.delete') }}"><i class="fas fa-trash"></i></button>
+                  <button type="submit" class="btn btn-danger btn-sm delete-asset" data-tooltip="true" title="{{ trans('general.delete') }}" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $fieldset->name]) }}" data-icon="fa fa-trash" data-target="#dataConfirmModal" onClick="return false;"><i class="fas fa-trash"></i></button>
                   @endif
                 </form>
                 @endcan
@@ -254,7 +254,7 @@
                       <i class="fas fa-trash" aria-hidden="true"></i>
                       <span class="sr-only">{{ trans('button.delete') }}</span></button>
                   @else
-                    <button type="submit" class="btn btn-danger btn-sm" data-tooltip="true" title="{{ trans('general.delete') }}">
+                    <button type="submit" class="btn btn-danger btn-sm delete-asset" data-tooltip="true" title="{{ trans('general.delete') }}" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $field->name]) }}" data-target="#dataConfirmModal" data-icon="fa fa-trash" onClick="return false;">
                       <i class="fas fa-trash" aria-hidden="true"></i>
                       <span class="sr-only">{{ trans('button.delete') }}</span>
                     </button>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 1489cf1e5e..8d696c1fc4 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -1442,16 +1442,6 @@
     @endcan
 @stop
             @section('moar_scripts')
-                <script>
-
-                    $('#dataConfirmModal').on('show.bs.modal', function (event) {
-                        var content = $(event.relatedTarget).data('content');
-                        var title = $(event.relatedTarget).data('title');
-                        $(this).find(".modal-body").text(content);
-                        $(this).find(".modal-header").text(title);
-                    });
-
-                </script>
     @include ('partials.bootstrap-table')
 
 @stop
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index b571651c8d..27f302ff99 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -551,7 +551,7 @@
             </a>
         </span>
       @else
-        <a href="#"  class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{  trans('general.delete') }}" onClick="return false;">
+        <a href="#"  class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true"  data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }}" data-title="{{  trans('general.delete') }}" onClick="return false;">
           <x-icon type="checkin" />
           {{ trans('admin/licenses/general.bulk.checkin_all.button') }}
         </a>
@@ -561,10 +561,10 @@
     @can('delete', $license)
 
       @if ($license->availCount()->count() == $license->seats)
-        <button class="btn btn-block btn-danger btn-sm btn-social delete-license" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal">
+        <a class="btn btn-block btn-danger btn-sm btn-social delete-asset" data-icon="fa fa trash" data-toggle="modal" data-title="{{ trans('general.delete') }}" data-content="{{ trans('general.delete_confirm', ['item' => $license->name]) }}" data-target="#dataConfirmModal" onClick="return false;">
           <x-icon type="delete" />
           {{ trans('general.delete') }}
-        </button>
+        </a>
       @else
           <span data-tooltip="true" title=" {{ trans('admin/licenses/general.delete_disabled') }}">
             <a href="#" class="btn btn-block btn-danger btn-sm btn-social delete-license disabled">
@@ -609,15 +609,5 @@
 
 
 @section('moar_scripts')
-  <script>
-
-    $('#dataConfirmModal').on('show.bs.modal', function (event) {
-      var content = $(event.relatedTarget).data('content');
-      var title = $(event.relatedTarget).data('title');
-      $(this).find(".modal-body").text(content);
-      $(this).find(".modal-header").text(title);
-    });
-
-  </script>
   @include ('partials.bootstrap-table')
 @stop
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 7aef30b18d..0d6da02c52 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -293,7 +293,7 @@
                             {{ trans('general.delete') }}
                         </button>
                     @else
-                        <button class="btn btn-block btn-sm btn-danger btn-social delete-asset" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $model->name]) }}" data-target="#dataConfirmModal" data-tooltip="true"  data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}">
+                        <button class="btn btn-block btn-sm btn-danger btn-social delete-asset" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $model->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.asset_model')]) }}" onClick="return false;">
                             <x-icon type="delete" />
                             {{ trans('general.delete') }}
                         </button>
@@ -311,15 +311,6 @@
 
 @section('moar_scripts')
 
-        <script>
-            $('#dataConfirmModal').on('show.bs.modal', function (event) {
-                var content = $(event.relatedTarget).data('content');
-                var title = $(event.relatedTarget).data('title');
-                $(this).find(".modal-body").text(content);
-                $(this).find(".modal-header").text(title);
-            });
-        </script>
-
     @include ('partials.bootstrap-table', ['exportFile' => 'manufacturer' . $model->name . '-export', 'search' => false])
 
 @stop
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index c8a47ab4ad..87fa92acd8 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -1051,7 +1051,7 @@
                 .replace('%DOWNLOAD_BUTTON%', (row.exists_on_disk === true) ? '<a href="'+ row.url +'" class="btn btn-sm btn-default"><x-icon type="download" /></a> ' : '<span class="btn btn-sm btn-default disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="download" /></span>')
                 .replace('%NEW_WINDOW_BUTTON%', (row.exists_on_disk === true) ? '<a href="'+ row.url +'?inline=true" class="btn btn-sm btn-default" target="_blank"><x-icon type="external-link" /></a> ' : '<span class="btn btn-sm btn-default disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="external-link"/></span>')
                 .replace('%DELETE_BUTTON%', (row.available_actions.delete === true) ?
-                    '<a href="'+delete_url+'" class="delete-asset btn btn-danger btn-sm" data-data-icon="fa-heart" data-toggle="modal" data-content="{{ trans('general.file_upload_status.confirm_delete') }} '+ row.filename +'?" data-title="{{ trans('general.delete') }}" onClick="return false;" data-target="#dataConfirmModal"><x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>' :
+                    '<a href="'+delete_url+'" class="delete-asset btn btn-danger btn-sm" data-icon="fa-trash" data-toggle="modal" data-content="{{ trans('general.file_upload_status.confirm_delete') }} '+ row.filename +'?" data-title="{{ trans('general.delete') }}" onClick="return false;" data-target="#dataConfirmModal"><x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>' :
                     '<a class="btn btn-sm btn-danger disabled" data-tooltip="true" title="{{ trans('general.file_upload_status.file_not_found') }}"><x-icon type="delete" /><span class="sr-only">{{ trans('general.delete') }}</span></a>'
                 );
         })
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 28d8ab0318..835a8d9013 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -823,12 +823,6 @@
           .on('select2:select', function (event) {
               window.location.href = event.params.data.element.dataset.route;
           });
-
-      $('#dataConfirmModal').on('show.bs.modal', function (event) {
-          var content = $(event.relatedTarget).data('content');
-          var title = $(event.relatedTarget).data('title');
-          $(this).find(".modal-body").text(content);
-          $(this).find(".modal-header").text(title);
-      });
+      
   </script>
 @stop