From da5f7f5d5e6d212fe59d05bec20f8f8db5e063e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 25 Mar 2020 16:23:19 +0300
Subject: [PATCH] close #1379 Fixed: App delete link show wrong name

---
 .../views/partials/form/delete_button.blade.php     | 13 ++++++++++++-
 resources/views/partials/form/delete_link.blade.php | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/form/delete_button.blade.php b/resources/views/partials/form/delete_button.blade.php
index d2bf894ff..10d754876 100644
--- a/resources/views/partials/form/delete_button.blade.php
+++ b/resources/views/partials/form/delete_button.blade.php
@@ -10,11 +10,22 @@
     }
 
     $text = $text ? $text : $page;
+
+    $title = trans_choice('general.' . $text, 2);
+    $type = mb_strtolower(trans_choice('general.' . $text, 1));
+
+    // for module
+    if (\Str::contains($text, ['::'])) {
+        $title = trans_choice($text, 2);
+        $type = mb_strtolower(trans_choice($text, 1)); 
+    }
+
+    $message = trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => $type]);
 @endphp
 
 {!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> ' . trans('general.delete'), array(
     'type'    => 'button',
     'class'   => 'btn btn-danger btn-xs',
     'title'   => trans('general.delete'),
-    '@click'  => 'confirmDelete("' . $url . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $item->$value . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
+    '@click'  => 'confirmDelete("' . $url . '", "' . $title . '", "' . $message . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
 )) !!}
diff --git a/resources/views/partials/form/delete_link.blade.php b/resources/views/partials/form/delete_link.blade.php
index d10ca086e..888f3c857 100644
--- a/resources/views/partials/form/delete_link.blade.php
+++ b/resources/views/partials/form/delete_link.blade.php
@@ -12,11 +12,22 @@
     $text = $text ? $text : $page;
 
     $name = addslashes($item->$value);
+
+    $title = trans_choice('general.' . $text, 2);
+    $type = mb_strtolower(trans_choice('general.' . $text, 1));
+
+    // for module
+    if (\Str::contains($text, ['::'])) {
+        $title = trans_choice($text, 2);
+        $type = mb_strtolower(trans_choice($text, 1)); 
+    }
+
+    $message = trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => $type]);
 @endphp
 
 {!! Form::button(trans('general.delete'), array(
     'type'    => 'button',
     'class'   => 'dropdown-item action-delete',
     'title'   => trans('general.delete'),
-    '@click'  => 'confirmDelete("' . $url . '", "' . trans_choice('general.' . $text, 2) . '", "' . trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => mb_strtolower(trans_choice('general.' . $text, 1))]) . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
+    '@click'  => 'confirmDelete("' . $url . '", "' . $title . '", "' . $message . '", "' . trans('general.cancel') . '", "' . trans('general.delete') . '")'
 )) !!}