Added parent info to recycle bin

diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index ab7f153224afd41bb90e9cd54a9472895727b619..63d08e0e8ed41676228227023c5b33ac8d2a02b7 100755 (executable)
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -92,6 +92,7 @@ return [
     'recycle_bin' => 'Recycle Bin',
     'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
     'recycle_bin_deleted_item' => 'Deleted Item',
     'recycle_bin' => 'Recycle Bin',
     'recycle_bin_desc' => 'Here you can restore items that have been deleted or choose to permanently remove them from the system. This list is unfiltered unlike similar activity lists in the system where permission filters are applied.',
     'recycle_bin_deleted_item' => 'Deleted Item',

+    'recycle_bin_deleted_parent' => 'Parent',

     'recycle_bin_deleted_by' => 'Deleted By',
     'recycle_bin_deleted_at' => 'Deletion Time',
     'recycle_bin_permanently_delete' => 'Permanently Delete',
     'recycle_bin_deleted_by' => 'Deleted By',
     'recycle_bin_deleted_at' => 'Deletion Time',
     'recycle_bin_permanently_delete' => 'Permanently Delete',

diff --git a/resources/views/settings/recycle-bin/index.blade.php b/resources/views/settings/recycle-bin/index.blade.php
index b5de84efa5e212646df8d7ccff5fc546b25dfc77..54420d0a22792034facac934be31c9720069bca5 100644 (file)
--- a/resources/views/settings/recycle-bin/index.blade.php
+++ b/resources/views/settings/recycle-bin/index.blade.php
@@ -39,7 +39,8 @@
 
             <table class="table">
                 <tr>
 
             <table class="table">
                 <tr>

-                    <th width="50%">{{ trans('settings.recycle_bin_deleted_item') }}</th>
+                    <th width="30%">{{ trans('settings.recycle_bin_deleted_item') }}</th>
+                    <th width="20%">{{ trans('settings.recycle_bin_deleted_parent') }}</th>

                     <th width="20%">{{ trans('settings.recycle_bin_deleted_by') }}</th>
                     <th width="15%">{{ trans('settings.recycle_bin_deleted_at') }}</th>
                     <th width="15%"></th>
                     <th width="20%">{{ trans('settings.recycle_bin_deleted_by') }}</th>
                     <th width="15%">{{ trans('settings.recycle_bin_deleted_at') }}</th>
                     <th width="15%"></th>


@@ -78,6 +79,16 @@
                         </div>
                         @endif
                     </td>
                         </div>
                         @endif
                     </td>

+                    <td>
+                        @if($deletion->deletable->getParent())
+                        <div class="table-entity-item">
+                            <span role="presentation" class="icon text-{{$deletion->deletable->getParent()->getType()}}">@icon($deletion->deletable->getParent()->getType())</span>
+                            <div class="text-{{ $deletion->deletable->getParent()->getType() }}">
+                                {{ $deletion->deletable->getParent()->name }}
+                            </div>
+                        </div>
+                        @endif
+                    </td>

                     <td>@include('partials.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by])</td>
                     <td width="200">{{ $deletion->created_at }}</td>
                     <td width="150" class="text-right">
                     <td>@include('partials.table-user', ['user' => $deletion->deleter, 'user_id' => $deletion->deleted_by])</td>
                     <td width="200">{{ $deletion->created_at }}</td>
                     <td width="150" class="text-right">