From a18e90c22af8449bb23ca761a7536f561edadbf0 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 Feb 2017 23:04:49 -0800
Subject: [PATCH] Fix delete modals

---
 resources/views/layouts/default.blade.php          | 5 +++--
 resources/views/partials/bootstrap-table.blade.php | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index e18c1bfb8a..015ee092c6 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -639,8 +639,9 @@
                 <form method="post" id="deleteForm" role="form">
                     {{ csrf_field() }}
                     {{ method_field('DELETE') }}
-                    <button type="button" class="btn btn-default  pull-left" data-dismiss="modal">Close</button>
-                    <button type="submit" class="btn btn-outline" id="dataConfirmOK">@lang('general.yes')</button>
+
+                    <button type="button" class="btn btn-default  pull-left" data-dismiss="modal">{{ trans('general.cancel') }}</button>
+                    <button type="submit" class="btn btn-outline" id="dataConfirmOK">{{ trans('general.yes') }}</button>
                 </form>
                 </div>
             </div>
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 6fd62afb94..fcedca3070 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -125,9 +125,11 @@ $('.snipe-table').bootstrapTable({
             }
 
             if (row.available_actions.delete === true) {
-                actions += '<a data-html="false" class="btn delete-asset btn-danger btn-sm" ' +
-                    + 'data-toggle="modal" href="" data-content="Are you sure you wish to delete this?" '
-                    + 'data-title="{{  trans('general.delete') }}?" onClick="return false;">'
+                actions += '<a href="{{ url('/') }}/' + destination + '/' + row.id + '" '
+                    + ' class="btn btn-danger btn-sm delete-asset" '
+                    + ' data-toggle="modal" '
+                    + ' data-content="Are you sure you wish to delete ' + row.name + ' (' + row.id + ')?" '
+                    + ' data-title="{{  trans('general.delete') }}?" onClick="return false;">'
                     + '<i class="fa fa-trash"></i></a></nobr>';
             }
             return actions;